fetch and merge operation in source tree

[Gupta Kesavarapu]

Instead of doing pull operation from source tree, I want to do fetch and merge operation to check which are all the files pulled from my remote repository to local.

In merge operation, I can see all the files that are fetched from remote. Out of them, I don't want my local file to update with remote changes in 1 of the file. Because in 1 of the file, I am currently doing some inprogress work. so, I don't want to push these in progress changes at this stage and at the same time, I don't want to take update from repository for this file. can I ignore that particular file in doing the merge operation?

[minnsey]

Hi

I would suggest stashing the 1 file you have changed before running the fetch + merge.