Merge <branch>
Monday, January 22, 2018
5:46 AM
#from the 'receiver' instantiate the command 'git merge name_of_branch'
git merge name_of_branch
#checks to verify merfe was successful:  git diff master..name_of_branch
git branch --merged
#No ff option, not Fast-Forward
# --no-ff 
git merge --no-ff branch_name
#vs
#--ff-only
git merge --ff-only branch_name
#merge strategies:  Recursive, 
#abort
git merge --abort
git merge branch_name
#after manual fix.
#check in browser
git add Conflict_fixed_file
#commit stage does not need a message since it was in the middle of a merge
git commit
git log --oneline -4