git clone https://gist.github.com/abef31ca104ecffa2d99fb904aadcf59.git git-merging
cd git-merging
Merge the change-value
branch into master
, to bring in the change of value:
git merge origin/change-value
will fail with "Automatic merge failed; fix