diff options
Diffstat (limited to 'doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment')
| -rw-r--r-- | doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment b/doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment new file mode 100644 index 000000000..05e958f76 --- /dev/null +++ b/doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="Horus" + subject="comment 3" + date="2016-04-17T14:10:37Z" + content=""" +A very belayed reply... + +I would really love to see a feature to make this easier! Like + +* Interactive merge: During merge the user is asked for each file that conflicts, if it wants to keep the local or the remote +* A set merge tool: A tool that allows to either select the local or remote file, renames it accordingly and commits it. + +Currently, I really fear a merge conflict, because I work with sets of binary files that needs to be in a coherent state and a merge conflict gives me very much trouble restoring that state. + +Thanks! +"""]] |