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

comment

Browse source
This commit is contained in:
Joey Hess 2016-06-13 21:55:53 -04:00
parent 486c355cc1
commit a0f8e9360b
Failed to extract signature
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-06-14T01:55:03Z"
content="""
Forgot to mention that the repeated merge commits happened because git
merge -no-ff was being used, which makes a merge commit even when it can
just fast-forward. That was removed as part of the fix, so the repeated
merges should also be resolved.
"""]]