Merging 2 files *only* where there are changes?
I have two very similar files, about 6000 lines long. I want to bring across some minor changes from File 1 into File 2, without losing the extra lines in File 2.
The Compare plugin highlights the issue. I want to keep the new lines in File 2 (marked green +), BUT I want to bring across the changed strings from File 1 (marked yellow !=). This screenshot makes sense of this, I hope.
Basically, I’m trying to work out an automated way of transferring all the yellow != lines from File 1 to File 2. And I’m at the limit of my understanding of notepad++. I’d appreciate any help you can offer!