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

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus 2012-06-23 07:24:23 +00:00 committed by admin
parent f0617ece7c
commit c6daf4e6c2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn Normal file
View file

@ -0,0 +1,4 @@
running 'git annex sync' doesn't merge the branches as expected (from the limited testing I have done) with git 1.7.10, the behaviour of merge has changed, it now asks for a commit message. I would expect setting _GIT_MERGE_AUTOEDIT=no_ should resolve this issue.
I had to manually do a merge (or set that variable) to get the branches back in sync again, this confused me a bit when git-annex watch was running in the background on a remote and it did not pick up the changes.