From 8312cac018f198dc27037127afd42fe219b0340d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 Aug 2020 11:30:44 -0400 Subject: [PATCH] comment and moreinfo --- ...ex_sync_remove_all_recently_added_files.mdwn | 2 ++ ..._1_58faf8b37bb276e6176233d3daa24db9._comment | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 doc/bugs/git_annex_sync_remove_all_recently_added_files/comment_1_58faf8b37bb276e6176233d3daa24db9._comment diff --git a/doc/bugs/git_annex_sync_remove_all_recently_added_files.mdwn b/doc/bugs/git_annex_sync_remove_all_recently_added_files.mdwn index e277633da9..62d1b88203 100644 --- a/doc/bugs/git_annex_sync_remove_all_recently_added_files.mdwn +++ b/doc/bugs/git_annex_sync_remove_all_recently_added_files.mdwn @@ -57,3 +57,5 @@ Ubuntu 18.04.4 LTS -> git-annex version: 6.20180227 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) nope allways have this weird bug who come to haunt me time to time. + +[[!tag moreinfo]] diff --git a/doc/bugs/git_annex_sync_remove_all_recently_added_files/comment_1_58faf8b37bb276e6176233d3daa24db9._comment b/doc/bugs/git_annex_sync_remove_all_recently_added_files/comment_1_58faf8b37bb276e6176233d3daa24db9._comment new file mode 100644 index 0000000000..0b96fe0dda --- /dev/null +++ b/doc/bugs/git_annex_sync_remove_all_recently_added_files/comment_1_58faf8b37bb276e6176233d3daa24db9._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2020-08-06T15:23:48Z" + content=""" +Is this repository using an adjusted branch? + +Does the problem commit have a commit message like "git-annex automatic +merge conflict fix"? + +I'm asking, because other than those two things, `git annex sync` is +really the same as `git merge`, in fact that's what it does. + +(It's also a bit of a red flag to me that you're using a mix of git-annex +versions going back to 6 years old! So some bug fixed in those +6 years could be affecting you.) +"""]] -- 2.30.2