Try to go line by line erasing a line out of one of the deltas, and keeping only what is different between the two. Then, hopefully it should just be a matter of keeping what you didn't delete and the stuff in the delta you haven't erased lines of code out of. Clearly the stuff from the trimmed down delta needs to be spliced into the right place in the otherwise unmolested delta. The problem with this of course begs the question "What if something was legitimately deleted?" and that can be the very hardest thing to see when doctoring merge conflicts together. I have readded code that was supposed to be destroyed before.
No comments:
Post a Comment