diff options
| author |  Horus <Horus@web> | 2016-04-17 14:10:15 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2016-04-17 14:10:15 +0000 |
| commit | a6396dd9d67f7b9eea9196fbf769b227302e0a6f (patch) | |
| tree | 5e12295c2a9d88e4e1445c28e182599d2e0e5af6 | |
| parent | c6d028f5e85e8cf3dcc2c15cf2e9d40a6ad16b81 (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment b/doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment new file mode 100644 index 000000000..930253db3 --- /dev/null +++ b/doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="Horus" + subject="comment 2" + date="2016-04-17T14:10:15Z" + 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! +"""]] |