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
When it comes to a range of commits, cherry-picking is was not practical. As mentioned below by Keith Kim, Git 1.7.2+ introduced the ability to cherry-pick a range of commits (but you still need to be aware of the consequence of cherry-picking for future merge) git cherry-pick” learned to pick a range of commits (e.g. … Read more
Use git diff, with name-only to show only the names, and diff-filter=U to only include ‘Unmerged’ files (optionally, relative to show paths relative to current working directory) . git diff –name-only –diff-filter=U –relative
I generally like to merge master into the development first so that if there are any conflicts, I can resolve in the development branch itself and my master remains clean. (on branch development)$ git merge master (resolve any merge conflicts if there are any) git checkout master git merge development (there won’t be any conflicts … Read more
Check out the aq branch, and rebase from master. git checkout aq git rebase master
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
Latest Git: git merge –abort This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes from before the merge, although it cannot always do so reliably. Generally you shouldn’t merge with uncommitted changes anyway. Prior to version 1.7.4: git reset … Read more
WARNING: it will delete untracked files, so it’s not a great answer to the question being posed. I hit this message as well. In my case, I didn’t want to keep the files, so this worked for me: git 2.11 and newer git clean -d -f . older git git clean -d -f “” If … Read more
TL;DR A git rebase workflow does not protect you from people who are bad at conflict resolution or people who are used to a SVN workflow, like suggested in Avoiding Git Disasters: A Gory Story. It only makes conflict resolution more tedious for them and makes it harder to recover from bad conflict resolution. Instead, … Read more
A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: git checkout branchA git merge -X theirs branchB However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours … Read more