3 ms·
Except, that isn't enough. What do I do if a merge fails? How do I abandon the merge (git certainly doesn't help you, it just keep complaning that there is an
by CJefferson 14y ago
Except, that isn't enough.
What do I do if a merge fails? How do I abandon the merge (git certainly doesn't help you, it just keep complaning that there is an unresolved merge).
Why do I get 'git push' telling me there is nothing to push, but 'git pull' telling me I have branches with resolved merges (because git push pushes only one branch, and git pull pull everything).
Those are just two things I've seen beginners hit recently.
- jlgreco 14y agoFollowing the rest of the discussion, at those points you do what you do with any other tool you use: pop into the manpages for two minutes and figure it out.
- chris_wot 14y agoWhat do I do if a merge fails? From the man page of git-merge: Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also git-stash(1). git pull and git merge will stop without doing anything when local uncommitted changes overlap with files that git pull/git merge may need to update. How do I abandon the merge? From the man page of git-merge: --abort Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge. git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present.
- deleted 14y ago[deleted]