git merge master conflicts todo list.

JP: いっちゃん最初に git merge master のときの CONFLICTS

Author: kuma35

Documentation-po/conflicts-todo.txt

@@ -0,0 +1,88 @@
+# -*- mode: org -*-
+# cd Documentation-po
+# git merge master > conflicts-todo.txt
+# modify and git add each file.
+# toggle todo C-c C-t
+# Auto-merging .gitignore
+* DONE CONFLICT (content): Merge conflict in .gitignore
+# Auto-merging Documentation/Makefile
+* DONE CONFLICT (content): Merge conflict in Documentation/Makefile
+# Auto-merging Documentation/asciidoc.conf.in
+* DONE CONFLICT (content): Merge conflict in Documentation/asciidoc.conf.in
+# Auto-merging Documentation/config/help.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/config/help.adoc
+# Auto-merging Documentation/config/mergetool.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/config/mergetool.adoc
+# Auto-merging Documentation/config/sendemail.adoc
+# Auto-merging Documentation/diff-generate-patch.adoc
+# Auto-merging Documentation/diff-options.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/diff-options.adoc
+# Auto-merging Documentation/fetch-options.adoc
+# Auto-merging Documentation/fsck-msgids.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/fsck-msgids.adoc
+# Auto-merging Documentation/git-cat-file.adoc
+# Auto-merging Documentation/git-check-attr.adoc
+# Auto-merging Documentation/git-check-ignore.adoc
+# Auto-merging Documentation/git-checkout.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-checkout.adoc
+# Auto-merging Documentation/git-clone.adoc
+# Auto-merging Documentation/git-config.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-config.adoc
+# Auto-merging Documentation/git-diff.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-diff.adoc
+# Auto-merging Documentation/git-fast-import.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-fast-import.adoc
+# Auto-merging Documentation/git-fetch.adoc
+# Auto-merging Documentation/git-fmt-merge-msg.adoc
+# Auto-merging Documentation/git-fsmonitor--daemon.adoc
+# Auto-merging Documentation/git-index-pack.adoc
+# Auto-merging Documentation/git-maintenance.adoc
+# Auto-merging Documentation/git-merge-tree.adoc
+# Auto-merging Documentation/git-multi-pack-index.adoc
+# Auto-merging Documentation/git-notes.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-notes.adoc
+# Auto-merging Documentation/git-p4.adoc
+# Auto-merging Documentation/git-rebase.adoc
+* DONE CONFLICT (modify/delete): Documentation/git-refs.txt deleted in master and modified in HEAD.  Version HEAD of Documentation/git-refs.txt left in tree.
+# Auto-merging Documentation/git-reset.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-reset.adoc
+# Auto-merging Documentation/git-restore.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-restore.adoc
+# Auto-merging Documentation/git-revert.adoc
+* DONE CONFLICT (modify/delete): Documentation/git-send-email.txt deleted in master and modified in HEAD.  Version HEAD of Documentation/git-send-email.txt left in tree.
+# Auto-merging Documentation/git-shortlog.adoc
+# Auto-merging Documentation/git-sparse-checkout.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-sparse-checkout.adoc
+# Auto-merging Documentation/git-submodule.adoc
+# Auto-merging Documentation/git-svn.adoc
+# Auto-merging Documentation/git-switch.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-switch.adoc
+# Auto-merging Documentation/git-update-index.adoc
+# Auto-merging Documentation/git-update-ref.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/git-update-ref.adoc
+# Auto-merging Documentation/git.adoc
+# Auto-merging Documentation/gitcli.adoc
+# Auto-merging Documentation/gitformat-pack.adoc
+# Auto-merging Documentation/gitnamespaces.adoc
+# Auto-merging Documentation/gitprotocol-http.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/gitprotocol-http.adoc
+# Auto-merging Documentation/gitprotocol-v2.adoc
+# Auto-merging Documentation/gitsubmodules.adoc
+# Auto-merging Documentation/gitweb.conf.adoc
+# Auto-merging Documentation/howto/recover-corrupted-object-harder.adoc
+# Auto-merging Documentation/pretty-formats.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/pretty-formats.adoc
+# Auto-merging Documentation/technical/api-index.sh
+* DONE CONFLICT (content): Merge conflict in Documentation/technical/api-index.sh
+# Auto-merging Documentation/technical/commit-graph.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/technical/commit-graph.adoc
+# Auto-merging Documentation/technical/hash-function-transition.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/technical/hash-function-transition.adoc
+# Auto-merging Documentation/technical/multi-pack-index.adoc
+# Auto-merging Documentation/technical/remembering-renames.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/technical/remembering-renames.adoc
+# Auto-merging Documentation/technical/sparse-checkout.adoc
+* DONE CONFLICT (content): Merge conflict in Documentation/technical/sparse-checkout.adoc
+# Auto-merging Documentation/user-manual.adoc
+# Automatic merge failed; fix conflicts and then commit the result.
+* DONE git merge --continue