Displaying 1 result from an estimated 1 matches for "r358552".
2019 Apr 17
6
How to deal with accidental directory tree deletes, downstream?
Hello fellow downstream residents,
I see that r358546 accidentally deleted an entire subtree, which was
reverted in r358552. This of course caused a big merge conflict in
our local repo, and internally we've been debating tactics for dealing
with it, hopefully without losing our original history.
Has anyone else handled this in a way that they are happy with? We
found a StackOverflow post that is potentially he...