gitでmergetoolを使用すると、opendiffがポップアップ表示されます。これは気に入っています。変更を確認し、何をどこに配置するかを選択します。「保存」を押して、ターミナルを振り返ります。「はい」と答えるように求めWas the merge successful? [y/n]られますが、「保存したばかりの新しいマージファイルを使用してください。保存したばかりのファイルではなく、保存したファイルを使用してください」と言う方法がわかりません。
Normal merge conflict for 'www/httpdocs/manifest/subsectionmanager-storage':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (opendiff):
www/httpdocs/manifest/subsectionmanager-storage seems unchanged.
Was the merge successful? [y/n] y
Normal merge conflict for 'www/httpdocs/workspace/themes/active/less/common.less':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (opendiff):
www/httpdocs/workspace/themes/active/less/common.less seems unchanged.
Was the merge successful? [y/n] ^[[A
www/httpdocs/workspace/themes/active/less/common.less seems unchanged.
Was the merge successful? [y/n] y
kirkstrobeck:atheycreek kirkstrobeck$ git add .
kirkstrobeck:atheycreek kirkstrobeck$ git add -u
kirkstrobeck:atheycreek kirkstrobeck$ git commit -m 'merged'
[master f6fed72] merged
12 files changed, 1330 insertions(+), 29 deletions(-)
mode change 100644 => 100755 www/httpdocs/workspace/data-sources/data.status_all_entries.php
mode change 100644 => 100755 www/httpdocs/workspace/data-sources/data.twitter.php
mode change 100644 => 100755 www/httpdocs/workspace/data-sources/data.twitter_latest_entry.php
create mode 100755 www/httpdocs/workspace/themes/active/less/common.less.orig
mode change 100644 => 100755 www/httpdocs/workspace/uploads/members/photos/amy_mcreynolds-4fb2e70566fb9.jpg
mode change 100644 => 100755 www/httpdocs/workspace/uploads/members/photos/rachel-4fb2e793b13bd.jpg
mode change 100644 => 100755 www/httpdocs/workspace/uploads/members/photos/tim-4fb3da80b15e3.jpg
mode change 100644 => 100755 www/httpdocs/workspace/xml-importers/xml-importer.twitter.php
mode change 100644 => 100755 www/httpdocs/workspace/xml-importers/xml-importer.ustream.php
mode change 100644 => 100755 www/httpdocs/workspace/xml-importers/xml-importer.vimeo.php
mode change 100644 => 100755 www/mysql/atheycreek_2012-05-16.sql
kirkstrobeck:atheycreek kirkstrobeck$ git stash apply
Auto-merging www/httpdocs/workspace/themes/active/less/common.less
CONFLICT (content): Merge conflict in www/httpdocs/workspace/themes/active/less/common.less
Auto-merging www/httpdocs/manifest/subsectionmanager-storage
CONFLICT (content): Merge conflict in www/httpdocs/manifest/subsectionmanager-storage
kirkstrobeck:atheycreek kirkstrobeck$
kirkstrobeck:atheycreek kirkstrobeck$ git config --global --list
user.name=kirkstrobeck
user.email=kirk@strobeck.com
user.user=kirkstrobeck
user.token=fd0010cb7e13a3f9bafe9766cfa81e7c
core.editor=nano
core.excludesfile=/Users/kirkstrobeck/.gitignore_global
github.user=kirkstrobeck
github.token=fd0010cb7e13a3f9bafe9766cfa81e7c
difftool.sourcetree.cmd=/Applications/Kaleidoscope.app/Contents/MacOS/ksdiff -w "$LOCAL" "$REMOTE"
difftool.sourcetree.path=
mergetool.sourcetree.cmd=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"
mergetool.sourcetree.trustexitcode=true
difftool.Kaleidoscope.cmd=ksdiff-wrapper git "$LOCAL" "$REMOTE"
difftool.prompt=false
diff.tool=Kaleidoscope
mergetool.keepbackup=true
kirkstrobeck:atheycreek kirkstrobeck$