The easiest thing to do would be to diff the results of your conflict resolution with a merge that auto-resolves conflicts without human intervention. Any automatic resolutions will be ignored, since they will be resolved in exactly the same way. I see two ways of visualizing the possible “evil” resolutions. If you are making this … Read more
The Short Answer As long as you’re doing a fast-forward merge, then you can simply use git fetch <remote> <sourceBranch>:<destinationBranch> Examples: # Merge local branch foo into local branch master, # without having to checkout master first. # Here `.` means to use the local repository as the “remote”: git fetch . foo:master # Merge … Read more
git log abc123^..abc123 shows the commits that got merged into merge-commit abc123. Create a git alias log-merge for easy reuse: $ git config –global alias.log-merge \ ‘!f() { git log –stat “$1^..$1”; }; f’ $ git log-merge abc123 For a one-line version: $ git config –global alias.log-merge-short \ ‘!f() { git log –pretty=oneline “$1^..$1”; }; … Read more
Found the answer after some digging EDIT: As per Mark’s suggestion, this is the best way to do so: git config –global core.mergeoptions –no-edit
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.
When content is in file.py from branch2 that is no longer applies to branch1, it requires picking some changes and leaving others. For full control do an interactive merge using the –patch switch: $ git checkout –patch branch2 file.py The interactive mode section in the man page for git-add(1) explains the keys that are to … Read more
Sure, being in master branch all you need to do is: git merge <commit-id> where commit-id is hash of the last commit from newbranch that you want to get in your master branch. You can find out more about any git command by doing git help <command>. It that case it’s git help merge. And … Read more
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running git add * git stash git pull This will track all files, remove all of your … Read more
You could set up a merge drive in a .gitattributes file (only for a given subtree, only for some file types) See this question for instance (or this one). # choose the name of the merge driver to be use for all jar files echo *.jar merge=keepTheir > dirWithJarFiles\.gitattributes Declare your merge driver in the … Read more
It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to the rule. For the others on this … Read more