gistfile1.txt

$ cd ~/projects/ialt
$ ls -1 
downloads
elateXam
elateXam-support
elateXamSmall.tar.gz
$ mkdir elateXamSmall
$ cp elateXamSmall.tar.gz elateXamSmall
$ cd elateXamSmall
$ tar xvzf elateXamSmall.tar.gz

$ git reset --hard

$ git remote add current ../elateXam

$ git fetch current
warning: no common commits
remote: Counting objects: 25137, done.
remote: Compressing objects: 100% (6102/6102), done.
remote: Total 25137 (delta 16561), reused 25036 (delta 16530)
Receiving objects: 100% (25137/25137), 44.39 MiB | 13.53 MiB/s, done.
Resolving deltas: 100% (16561/16561), done.
From ../elateXam
 * [new branch]      gh-pages   -> current/gh-pages
 * [new branch]      master     -> current/master
From ../elateXam
 * [new tag]         LIVE-20100330 -> LIVE-20100330
 * [new tag]         LIVE-20100528 -> LIVE-20100528
 * [new tag]         LIVE-2010416 -> LIVE-2010416

$ git br -a
  master
  remotes/current/gh-pages
  remotes/current/master

$ # create a temporary branch to test merging
$ git co -b tmp-merging-unrelated
$ git st
# On branch tmp-merging-unrelated
nothing to commit (working directory clean)

$ git merge current/master

Auto-merging examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java
CONFLICT (add/add): Merge conflict in examServer/src/main/java/de/thorstenberger/examServer/dao/xml/UserDaoJAXB.java
Auto-merging examServer/src/main/java/de/thorstenberger/examServer/model/User.hbm.xml
CONFLICT (add/add): Merge conflict in examServer/src/main/java/de/thorstenberger/examServer/model/User.hbm.xml
Auto-merging examServer/src/main/java/de/thorstenberger/examServer/model/User.java
CONFLICT (add/add): Merge conflict in examServer/src/main/java/de/thorstenberger/examServer/model/User.java
Auto-merging examServer/src/main/jaxb/users.xsd
CONFLICT (add/add): Merge conflict in examServer/src/main/jaxb/users.xsd
Auto-merging examServer/src/main/webapp/WEB-INF/pages/complexTask/index.jsp
CONFLICT (add/add): Merge conflict in examServer/src/main/webapp/WEB-INF/pages/complexTask/index.jsp
Auto-merging examServer/src/main/webapp/WEB-INF/security.xml
CONFLICT (add/add): Merge conflict in examServer/src/main/webapp/WEB-INF/security.xml
Auto-merging taskmodel/taskmodel-api/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/SubTasklet.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-api/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/SubTasklet.java
Auto-merging taskmodel/taskmodel-api/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/SubTasklet_Cloze.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-api/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/SubTasklet_Cloze.java
Auto-merging taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/ExecuteAction.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/ExecuteAction.java
Auto-merging taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskView_CLOZE.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskView_CLOZE.java
Auto-merging taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskView_TEXT.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskView_TEXT.java
Auto-merging taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskletInfoVO.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core-view/src/main/java/de/thorstenberger/taskmodel/view/SubTaskletInfoVO.java
Auto-merging taskmodel/taskmodel-core-view/src/main/webapp/execute.jsp
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core-view/src/main/webapp/execute.jsp
Auto-merging taskmodel/taskmodel-core/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/impl/AbstractSubTasklet.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/impl/AbstractSubTasklet.java
Auto-merging taskmodel/taskmodel-core/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/impl/SubTasklet_ClozeImpl.java
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-core/src/main/java/de/thorstenberger/taskmodel/complex/complextaskhandling/subtasklets/impl/SubTasklet_ClozeImpl.java
Auto-merging taskmodel/taskmodel-schema/src/main/jaxb/complexTaskDef.xsd
CONFLICT (add/add): Merge conflict in taskmodel/taskmodel-schema/src/main/jaxb/complexTaskDef.xsd
Automatic merge failed; fix conflicts and then commit the result.

$ # Ok, this does not work, but seemingly just because we add the same files twice
$ git reset --hard

$ git merge -s ours current/master 
Merge made by ours.

$ # project compile and deploys fine
$ # but it pulled in the whole history again
$ du -hs .git
 50M	.git

$ # let's go back
$ git reset --hard df056e5bddcbf2b18fa8b59067444264d2dc0e50
HEAD is now at df056e5 [fix] enable rendering of (at least some) unicode glyphs via embedding

$ # just for sanity
$ git co -b tmp-cherry-pick
Switched to a new branch 'tmp-cherry-pick'

$ # Input Language Machinery
$ git cherry-pick -x 1bbe7b6284cd535bfe9b -e

$ # Added simple confirmation prompt on exam startup. 
$ git cherry-pick -x 8a335faa57738b25e88e

$ # Accept and evaluate 'needManualCorrection' attribute on ClozeTask gaps.
$ git cherry-pick -x 3cdc141f18914ce548b1

$ # DjangoStyleShaPasswordEncoder to support different password/salt 
$ git cherry-pick -x f4e1b6aa1f72230b9cd6

$ # cleanup ...
$ git remote rm current