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:
Renaud 2013-12-13 06:16:12 +00:00 • committed by admin
parent a708a89346
commit 061852320d
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_2_299ad6cd0225daa166d36af3726a9ef2._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="Renaud"
ip="182.171.224.143"
subject="comment 2"
date="2013-12-13T06:16:12Z"
content="""
Thanks for the reply!
I tried to commit manually but I got confused by the (recently introduced?) annex/direct/master branch and I am not sure which branch I need to commit/merge/pull/push my changes to.
I also got blocked when pulling from origin fail due to file changes needed to be overwritten.
I see git-annex cleverly merges those in .git/annex/merge folder so I could try doing the same but I am not too confortable doing a large part of git-annex's job...
Is there a simpler way to sync with a remote repository?
"""]]