How to get my local changes for “deleted by them” files in git?

Question

I merge a remote branch into a local one. After merging I get "deleted by them" files. It means that in remote branch these files are removed, but they have changes in a local branch, that will be lost, if I simply remove files from local branch too.

How to get those changes in a diff form per file? Just to know - what I am losing.

Answer 1

You can use Meldmerge to compare your changes with the incoming ones from the repo. Create a copy of your project folder(Say folder1) and take a fresh pull in that.

Now folder1 is updated with the latest code as on remote repo. Now compare your project folder with folder1 using meld. You can clearly locate the differences per file at the same place and include those in the project folder if required by just a click.