<div dir="ltr">I'm pretty sure you could use 'git rebase' then 'git replace' to graft an alternate history over that patch of commits. Perform your merges, then optionally remove the replacements?<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 17 Apr 2019 at 22:05, via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello fellow downstream residents,<br>
<br>
I see that r358546 accidentally deleted an entire subtree, which was<br>
reverted in r358552.  This of course caused a big merge conflict in <br>
our local repo, and internally we've been debating tactics for dealing <br>
with it, hopefully without losing our original history.<br>
<br>
Has anyone else handled this in a way that they are happy with?  We<br>
found a StackOverflow post that is potentially helpful:<br>
<a href="https://stackoverflow.com/questions/44990103/how-to-undelete-file-in-git-and-keep-his-original-blame-history" rel="noreferrer" target="_blank">https://stackoverflow.com/questions/44990103/how-to-undelete-file-in-git-and-keep-his-original-blame-history</a><br>
Doing this on our local copy of the upstream repo means we would not<br>
have an exact copy anymore, which seems like a Bad Idea.<br>
<br>
Is there a smooth way to resolve the merge conflict that does *not*<br>
delete our local tree? I suppose we can somehow not accept the<br>
accidental deletes, and then when we run forward to r358552 it will<br>
decide we already have those files and it will Just Work?<br>
<br>
Tips and hints welcome.<br>
Thanks,<br>
--paulr<br>
<br>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div>