4 ms·Use stash for easier rebasing and/or pull --merge. git stash git pull --rebase origin master git stash popby dexen 13y agoUse stash for easier rebasing and/or pull --merge. git stash git pull --rebase origin master git stash pop