domcleal/README.md

Last active May 8, 2017 13:32

Star (1) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/domcleal/abef31ca104ecffa2d99fb904aadcf59.js"></script>
Save domcleal/abef31ca104ecffa2d99fb904aadcf59 to your computer and use it in GitHub Desktop.

Download ZIP

Resolve simple git merge/rebase conflicts

Raw

Setup

git clone https://gist.github.com/abef31ca104ecffa2d99fb904aadcf59.git git-merging
cd git-merging

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 conflicts and then commit the result."
Edit app.pl and keep the top block after the conflict marker, make the change from 7 to 42 and delete the unused block and all conflict markers.
git add app.pl
git commit

Tip: if it goes wrong when editing, run git merge --abort and start again.

The git log will now contain the original master commits, the change from 7 to 42 and then a merge commit that brings both together (with your alteration).

Rebasing

Check out the change-value branch and rebase (update it) on master.

git checkout change-value
git rebase master
Edit app.pl and keep the top block after the conflict marker, make the change from 7 to 42 and delete the unused block and all conflict markers.
git add app.pl
git rebase --continue

Tip: if it goes wrong when editing, run git rebase --abort and start again.

The git log will now contain all of the master commits, then a single change from 7 to 42 in the refactored method from master.

If you now repeated the merge of change-value into master, it would merge cleanly.

Raw

app.pl

	#!/usr/bin/env perl -w

	sub meaning_of_life {
	7;
	}

	print meaning_of_life . "\n";

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment