bashbaugh · January 26, 2019 18:45
diff --git a/merge-conflict-diff-example b/merge-conflict-diff-example
 ~/Documents/learning-git $ git merge b
 Auto-merging a.txt
 CONFLICT (content): Merge conflict in a.txt
 Automatic merge failed; fix conflicts and then commit the result.

 ~/Documents/learning-git $ git diff a b
 ... <-- You can ignore the lines right here for now, these are the important lines:
 -Adam  <-- this tells us that Adam was removed in branch b
 +Bob <-- and this tells us that Bob was added.
	~/Documents/learning-git $ git merge b
	Auto-merging a.txt
	CONFLICT (content): Merge conflict in a.txt
	Automatic merge failed; fix conflicts and then commit the result.

	~/Documents/learning-git $ git diff a b
	... <-- You can ignore the lines right here for now, these are the important lines:
	-Adam <-- this tells us that Adam was removed in branch b
	+Bob <-- and this tells us that Bob was added.
No results found