マスターを反映

(op)hdknr@host:~$ git pull git://github.com/openid/Contract-Exchange-Extension.git master -f
From git://github.com/openid/Contract-Exchange-Extension
* branch            master     -> FETCH_HEAD
Auto-merging spec/openid-contract-exchange-1_0.html
CONFLICT (content): Merge conflict in spec/openid-contract-exchange-1_0.html
Automatic merge failed; fix conflicts and then commit the result.

resolveしてみる。

(op)hdknr@host:~$ git pull git://github.com/openid/Contract-Exchange-Extension.git master -f -s resolve
You are in the middle of a conflicted merge.

内容を見てみる。

(op)hdknr@host:~$ sed -n ‘/^««</,/^»»>/p’ spec/openid-contract-exchange-1_0.html
«««< HEAD
<meta http-equiv=”Expires” content=”Tue, 26 Jan 2010 06:23:00 +0000”>
=======
<meta http-equiv=”Expires” content=”Tue, 26 Jan 2010 18:03:50 +0000”>
»»»> d51005fb1141705a05c8a5933569d18a0ae8cee1 

HEADの方を生かすように編集

(op)hdknr@host:~$ vi spec/openid-contract-exchange-1_0.html

修正をコミット

(op)hdknr@debuniid:~$ git add .
(op)hdknr@host:~$ git commit -a -m “fix comflict?”
[master 6ba6a56] fix comflict?

フォークに反映

(op)hdknr@host:~$ git push
Counting objects: 16, done.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 951 bytes, done.
Total 9 (delta 6), reused 0 (delta 0)
To git@github.com:hdknr/Contract-Exchange-Extension.git
   58cb9c2..6ba6a56  master –> master

Masterが一致した。

よく見たらd51005fb1141705a05c8a5933569d18a0ae8cee1 を以下すべきだったような気がする。。。。