From 061852320d18b38c7c6a5b5ec6f2657cea483d71 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 13 Dec 2013 06:16:12 +0000 Subject: [PATCH] Added a comment --- ...ent_2_299ad6cd0225daa166d36af3726a9ef2._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_2_299ad6cd0225daa166d36af3726a9ef2._comment diff --git a/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_2_299ad6cd0225daa166d36af3726a9ef2._comment b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_2_299ad6cd0225daa166d36af3726a9ef2._comment new file mode 100644 index 0000000000..0fb4a00977 --- /dev/null +++ b/doc/forum/is_there_a_way_to_only_commit_some_files_in_direct-mode___63__/comment_2_299ad6cd0225daa166d36af3726a9ef2._comment @@ -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? +"""]]