git merge. #git

gistfile1

 
1. Start with a clean working directory 
2. current branch is always the target 
3. investigate conflicts with git diff (or git mergetool) 
4. edit conflicting files 
5. git add file 
6. git commit 
 
Aborting a merge: 
git reset --hard HEAD	# prior to merge commit 
git reset --hard ORIG_HEAD	# after merge commit 
git checkout -m		# bad conflict resolution - return to original conflict state