TJ Borromeo
TJ Borromeo
Isn't this problem similar to 'git rebase '? Any time you're trying to make a two way merge where changes occur in different places, then you have a setup where:...
This symmetry is violated with intraline ( different changes occurring on the same line ) diff's. Therefore, you are stuck with selecting one change as true over another. This leads...