From f3a776bc5e9a02a5e0887c2cab29e9c6d7ed8b9e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 May 2020 12:29:25 -0400 Subject: [PATCH] response --- ...comment_1_4a32a727560ab85203d1dd76feff2e1e._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/How_to_fix_bad_merge/comment_1_4a32a727560ab85203d1dd76feff2e1e._comment diff --git a/doc/forum/How_to_fix_bad_merge/comment_1_4a32a727560ab85203d1dd76feff2e1e._comment b/doc/forum/How_to_fix_bad_merge/comment_1_4a32a727560ab85203d1dd76feff2e1e._comment new file mode 100644 index 0000000000..6af1305dbe --- /dev/null +++ b/doc/forum/How_to_fix_bad_merge/comment_1_4a32a727560ab85203d1dd76feff2e1e._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2020-05-05T16:28:32Z" + content=""" +Find the commit that deleted the files (eg with `git log --stat`) +and `git revert` that commit. + +AKA, same way you would deal with a problem commit in any git repository. +"""]]