gistfile1.txt

tekkub@iSenberg ~/tmp ❯ mkdir mergefun
tekkub@iSenberg ~/tmp ❯ cd mergefun/
tekkub@iSenberg ~/tmp/mergefun ❯ git init
Initialized empty Git repository in /Users/tekkub/tmp/mergefun/.git/

tekkub@iSenberg ~/tmp/mergefun master# ❯ echo "This is a test" > a.txt
tekkub@iSenberg ~/tmp/mergefun master# ❯ git add a.txt
tekkub@iSenberg ~/tmp/mergefun master# ❯ git commit -m "it's a start"
[master (root-commit) 788ddd4] it's a start
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 a.txt

tekkub@iSenberg ~/tmp/mergefun master ❯ git branch other
tekkub@iSenberg ~/tmp/mergefun master ❯ git mv a.txt b.txt
tekkub@iSenberg ~/tmp/mergefun master+ ❯ git commit -m "Movin up"
[master e71dd50] Movin up
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename a.txt => b.txt (100%)

tekkub@iSenberg ~/tmp/mergefun master ❯ echo "rawr" > b.txt 
tekkub@iSenberg ~/tmp/mergefun master* ❯ git add b.txt
tekkub@iSenberg ~/tmp/mergefun master+ ❯ git commit -m "imma bear"
[master f3e9165] imma bear
 1 files changed, 1 insertions(+), 1 deletions(-)

tekkub@iSenberg ~/tmp/mergefun master ❯ git checkout other 
Switched to branch 'other'

tekkub@iSenberg ~/tmp/mergefun other ❯ git mv a.txt b.txt
tekkub@iSenberg ~/tmp/mergefun other+ ❯ git commit -m "Movin over here"
[other fcb2ab1] Movin over here
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename a.txt => b.txt (100%)

tekkub@iSenberg ~/tmp/mergefun other ❯ echo "mew" > b.txt 
tekkub@iSenberg ~/tmp/mergefun other* ❯ git add b.txt
tekkub@iSenberg ~/tmp/mergefun other+ ❯ git commit -m "pet me"
[other d594996] pet me
 1 files changed, 1 insertions(+), 1 deletions(-)

tekkub@iSenberg ~/tmp/mergefun other ❯ git checkout master 
Switched to branch 'master'

tekkub@iSenberg ~/tmp/mergefun master ❯ git merge other 
Auto-merging b.txt
CONFLICT (add/add): Merge conflict in b.txt
Automatic merge failed; fix conflicts and then commit the result.

tekkub@iSenberg ~/tmp/mergefun master*+|MERGING ❯ cat b.txt 
<<<<<<< HEAD
rawr
=======
mew
>>>>>>> other