diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus <Jimmy@web> | 2012-06-23 07:24:23 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2012-06-23 07:24:23 +0000 |
| commit | c6daf4e6c22629fa6adacf3101129e2d3c8f89a3 (patch) | |
| tree | 27c005651582b31fac26892b82f793d1ae94b822 /doc | |
| parent | f0617ece7c2a56d27a57136e7289a69751b8f98e (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn b/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn new file mode 100644 index 000000000..2dd7e51b1 --- /dev/null +++ b/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn @@ -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. + |