I am using Git as my source control system. I use SourceTree as a GUI to help with this. SourceTree allows external diff tools to be launched when there is a merge conflict. I have configured it to use Beyond Compare 4 and this launches fine, with the correct three versions of the file displayed in the three panes at the stop of the screen.
My question is a very simple one and I can't help but feel it must have been answered already but I can't find it.
How do I have line-by-line control over which lines I take and discard from the left and right files?
I can resort to full edit but doing this, I end up literally retyping the lines displayed above because I can't figure out how to copy a line from the panes above.
Related to the above question is the problem of alignment. If I keep a line from the left file and then one from the right file, clearly my target files in the lower pane now has an extra line to the files I started with. is there a way to 'line-up' the compare again?
Any help or pointers to information would be very much appreciated.
Kind wishes ~ Patrick
My question is a very simple one and I can't help but feel it must have been answered already but I can't find it.
How do I have line-by-line control over which lines I take and discard from the left and right files?
I can resort to full edit but doing this, I end up literally retyping the lines displayed above because I can't figure out how to copy a line from the panes above.
Related to the above question is the problem of alignment. If I keep a line from the left file and then one from the right file, clearly my target files in the lower pane now has an extra line to the files I started with. is there a way to 'line-up' the compare again?
Any help or pointers to information would be very much appreciated.
Kind wishes ~ Patrick
Comment