Changelog-merge¶

bor@bik grimoire 0 $ git log -p -1
commit 83cac7378ad42bcd6bbcbb239c3107ee6f89bf86
Author: Bor Kraljič <pyrobor@ver.si>
Date:   Thu Oct 6 12:12:21 2011 +0200

    bbbbbbbbbbbbbbbbbbbbb

diff --git a/ChangeLog b/ChangeLog
index aaaa8e9..9c43442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-10-07 Bor Kraljič <pyrobor@ver.si>
+       * something new on "master" branch
+
 2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
          execution and deployment
bor@bik grimoire 0 $ git log -p -1 problematic-changelog 
commit e4490cbe10751fce61e81d6388f883b915634b9d
Author: Bor Kraljič <pyrobor@ver.si>
Date:   Thu Oct 6 12:08:20 2011 +0200

    ccccccccccccccc

diff --git a/ChangeLog b/ChangeLog
index aaaa8e9..036a8c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-10-06 Bor Kraljič <pyrobor@ver.si>
+       * some changes on one "devel" branch
+
 2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
          execution and deployment
bor@bik grimoire 0 $ git merge problematic-changelog 
Auto-merging ChangeLog
CONFLICT (content): Merge conflict in ChangeLog
Automatic merge failed; fix conflicts and then commit the result.
bor@bik grimoire 1 $ head -n 10 ChangeLog 
<<<<<<< HEAD
2011-10-07 Bor Kraljič <pyrobor@ver.si>
        * something new on "master" branch
=======
2011-10-06 Bor Kraljič <pyrobor@ver.si>
        * some changes on one "devel" branch
>>>>>>> problematic-changelog

2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
bor@bik grimoire 0 $ git reset --hard HEAD
HEAD is now at 83cac73 bbbbbbbbbbbbbbbbbbbbb
bor@bik grimoire 1 $ echo "ChangeLog    merge=merge-changelog" > .gitattributes
bor@bik grimoire 0 $ cat .gitattributes 
ChangeLog    merge=merge-changelog
bor@bik grimoire 0 $ grep change .git/config 
[merge "merge-changelog"]
        driver = /usr/bin/git-merge-changelog %O %A %B
bor@bik grimoire 0 $ grep -i change .git/config 
[merge "merge-changelog"]
        name = GNU-style ChangeLog merge driver
        driver = /usr/bin/git-merge-changelog %O %A %B
bor@bik grimoire 0 $ git log -p -1
commit 83cac7378ad42bcd6bbcbb239c3107ee6f89bf86
Author: Bor Kraljič <pyrobor@ver.si>
Date:   Thu Oct 6 12:12:21 2011 +0200

    bbbbbbbbbbbbbbbbbbbbb

diff --git a/ChangeLog b/ChangeLog
index aaaa8e9..9c43442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-10-07 Bor Kraljič <pyrobor@ver.si>
+       * something new on "master" branch
+
 2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
          execution and deployment
bor@bik grimoire 0 $ git log -p -1 problematic-changelog 
commit e4490cbe10751fce61e81d6388f883b915634b9d
Author: Bor Kraljič <pyrobor@ver.si>
Date:   Thu Oct 6 12:08:20 2011 +0200

    ccccccccccccccc

diff --git a/ChangeLog b/ChangeLog
index aaaa8e9..036a8c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-10-06 Bor Kraljič <pyrobor@ver.si>
+       * some changes on one "devel" branch
+
 2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
          execution and deployment
bor@bik grimoire 0 $ git merge
merge       mergetool   
bor@bik grimoire 0 $ git merge problematic-changelog 
Auto-merging ChangeLog
Merge made by recursive.
 ChangeLog |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
bor@bik grimoire 0 $ head -n 10 ChangeLog 
2011-10-06 Bor Kraljič <pyrobor@ver.si>
        * some changes on one "devel" branch

2011-10-07 Bor Kraljič <pyrobor@ver.si>
        * something new on "master" branch

2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
        * python-pypi/fabric: new spell, simple, Pythonic tool for remote
          execution and deployment

bor@bik grimoire 0 $