From 433b7b10955713da884cfc895845f541f03ce682 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 7 Dec 2011 15:58:41 +0100 Subject: [PATCH] better document resolving conflicts Signed-off-by: Sven Strickroth --- doc/images/en/ResolveConflict.png | Bin 0 -> 12637 bytes .../en/TortoiseGit/tsvn_dug/dug_conflicts.xml | 59 +++++++++++---------- 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 doc/images/en/ResolveConflict.png diff --git a/doc/images/en/ResolveConflict.png b/doc/images/en/ResolveConflict.png new file mode 100644 index 0000000000000000000000000000000000000000..4321cede2e9b6b0320b53e85d043700b529c22cb GIT binary patch literal 12637 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 literal 0 HcwPel00001 diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml index 126bce4aa..9880ddf15 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml @@ -26,12 +26,22 @@ code merged from repository >>>>>>> revision - - - - You can launch an external merge tool / conflict - editor with - - TortoiseGit - Edit Conflicts - - or you can use any other editor to manually - resolve the conflict. You should decide what the code - should look like, do the necessary changes and save the file. Afterwards execute the command @@ -86,33 +84,36 @@ and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. - - I use "git add" to mark file status as resolved - to allow you to commit your changes. + It uses "git add" to mark file status as resolved + to allow you to commit your changes + and it removes the + filename.ext.BASE.ext, + filename.ext.LOCAL.ext and + filename.ext.REMOTE.ext files. If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have - filename.ext.r* files. + filename.ext.BASE|LOCAL|REMOTE.ext files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the - Resolved command, then commit your version. + Resolved command, then commit your version. - You can use the Resolved command for multiple files + You can use the Resolved command for multiple files if you right click on the parent folder and select TortoiseGit - Resolve... + Resolve... This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved. +
+ The resolve conflicts dialog + +
-- 2.11.4.GIT