merge: elementtreeとcElementTree

[remote "save"]
url = git://git.tonic-water.com/public/elementtree-patched/.git
push = refs/heads/cimple

[branch "cimple"]
remote = save
merge = refs/heads/master

これでcimpleをcheckoutした状態でgit pushすると、remoteのcimpleにpushされます。

[nori@asama]~/Desktop/work/elementtree/c% git push
Counting objects: 109, done.
Compressing objects: 100% (107/107), done.
Writing objects: 100% (109/109), 128.01 KiB, done.
Total 109 (delta 63), reused 0 (delta 0)
To git://git.tonic-water.com/public/elementtree-patched/.git
* [new branch] cimple -> cimple

あとはworkにcheckoutしてworkでマージです。

[nori@asama]~/Desktop/work/elementtree/work% git checkout origin/cimple
Note: moving to "origin/cimple" which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b
HEAD is now at 473727f... added MANIFEST for python setup.py bdist_rpm

workからみてremoteのbranchをlocalにcheckoutし、それをベースにbranchをつくる(cimple)。
そしてmerge

[nori@asama]~/Desktop/work/elementtree/work% git merge cimple
Auto-merged CHANGES
CONFLICT (add/add): Merge conflict in CHANGES
Auto-merged MANIFEST
CONFLICT (add/add): Merge conflict in MANIFEST
Auto-merged PKG-INFO
CONFLICT (add/add): Merge conflict in PKG-INFO
Auto-merged README
CONFLICT (add/add): Merge conflict in README
Auto-merged VERSION
CONFLICT (add/add): Merge conflict in VERSION
Auto-merged samples/simple-ns.xml
CONFLICT (add/add): Merge conflict in samples/simple-ns.xml
Auto-merged samples/simple.xml
CONFLICT (add/add): Merge conflict in samples/simple.xml
Auto-merged selftest.py
CONFLICT (add/add): Merge conflict in selftest.py
Auto-merged setup.py
CONFLICT (add/add): Merge conflict in setup.py
Automatic merge failed; fix conflicts and then commit the result.