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

Added a comment: mess up commited to my branch

Browse source
This commit is contained in:
jules@a6ba859eba6f59bd980f294741b1ad9b7624552a 2022-09-29 09:26:06 +00:00 committed by admin
parent 6cf8d066e3
commit e4ff7014bd
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/android_sync_messes_tree/comment_1_a90afb9011c760843836728d03353619._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="jules@a6ba859eba6f59bd980f294741b1ad9b7624552a"
nickname="jules"
avatar="http://cdn.libravatar.org/avatar/a751e2ef9129dfaf6c68a0d762e5db60"
subject="mess up commited to my branch"
date="2022-09-29T09:26:05Z"
content="""
I noticed that even when the syncing finishes. Worse than that, the 'android/master' branch is merged into 'master'.
The removed files are brought back during the merge, but the moved files are committed.
I definitely don't want git annex to touch my master branch. I have 'autocommit = false', 'synconlyannex = true' and 'alwayscommit = false'. I take care of merging and pushing the 'git-annex' branch myself.
Perhaps I'm not using git-annex right ?
"""]]