As noted previously, pass in the –no-commit flag, but to avoid a fast-forward commit, also pass in –no-ff, like so: $ git merge –no-commit –no-ff $BRANCH To examine the staged changes: $ git diff –cached And you can undo the merge, even if it is a fast-forward merge: $ git merge –abort
If you don’t mind creating a new branch, this is how I dealt with the problem: Being on main: # create a new branch git checkout -b new_clean_branch # apply all changes git merge original_messy_branch # forget the commits but have the changes staged for commit git reset –soft main git commit -m “Squashed changes … Read more
Warning: Running this will discard local changes. Only run this if you want to discard local changes. I encountered the same problem and solved it by git checkout -f branch and its specification is rather clear. -f, –force When switching branches, proceed even if the index or the working tree differs from HEAD. This is … Read more
git merge -Xignore-all-space Or (more precise) git merge -Xignore-space-change should be enough to ignore all space related conflicts during the merge. See git diff: –ignore-space-change Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. –ignore-all-space Ignore whitespace when … Read more
All four buffers provide a different view of the same file. The top left buffer (LOCAL) is how the file looked in your target branch (what you are merging into). The top right buffer (REMOTE) is how the file looked in your source branch (where you are merging from). The middle buffer (BASE) is the … Read more
You mean this? git checkout destination_branch git merge tag_name
Short answer Don’t worry, Git will handle it. Long answer Unlike e.g. SVN1, Git does not store commits in delta format, but is snapshot-based2,3. While SVN would naively try to apply each merged commit as a patch (and fail, for the exact reason you described), Git is generally able to handle this scenario. When merging, … Read more
Here is a slightly easier method I just came up with when researching this: git fetch {remote} git checkout FETCH_HEAD — {file}
Found the solution here: http://gitster.livejournal.com/43665.html git checkout -m FILE This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.
as long as you did not commit you can type git merge –abort just as the command line suggested.