3 ms·
Can you point to a version control system that won't fall all over itself in this case? Also, what would an "ideal" VCS do in such a situation? Btw, have you t
by fr0sty 15y ago
Can you point to a version control system that won't fall all over itself in this case?
Also, what would an "ideal" VCS do in such a situation? Btw, have you tried this with git? What happens?
- fr0sty 15y agoI just tried this btw, If you merge B and C you will only have a conflict if the changes in B and C touch the same regions of the file. If not the merge is made automatically and the changes from both branches are reflected in the new file.
- yxhuvud 15y agoNo, I was replying to the claim that merging works and that stuff is never applied twice. Which it was. Specifically git suggested that I had a deletion of the new file unmerged. Thinking back on it, this doesn't make sense. I think the situation involved rebase as well. That is, rebasing a rename onto a branch that already has done the rename in question turns the second one into a deletion. (Or at least adds the deletion of the second file to the list of unmerged changes).