mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added a comment

Browse source
This commit is contained in:
Horus 2016-04-17 14:10:15 +00:00 • committed by admin
parent f24dba7616
commit b33b998cec
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment Normal file
View file

@ -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!
"""]]