0

I am trying to merge from developer branch to main its shows some files in pending changes, Following are the steps I followed 1. Merge from Main branch to Dev branch, so the Dev branch have update code 2. Merger from Dev to Main, however it says some files in pending changes and no new changes in compare tool for those pending changes files. Image shows there are still pending changes

Please let I know, what is missing in this.

Santosh Kotagi
  • 1
  • 1
  • Hi Santosh, Did you get a chance to implement the solution that I suggested? Were you able to resolve? Just checking to see if the information provided was helpful. If my reply helped or gave a right direction. Appreciate for [marking it as an answer](https://meta.stackexchange.com/questions/5234/how-does-accepting-an-answer-work) which will also helps others in the community. – PatrickLu-MSFT Oct 08 '19 at 10:21

1 Answers1

0

According to your description, seems some unchanged files also listed in pending changes. As a workaround you could undo the annoying changes, only keep the "Real" changes, detail steps please follow below:

Select all pending files on context menu click 'Undo...' ,before getting to the confirmation dialog, you are presented with a window to select which files to undo. This window has sortable columns. You can sort by the Change column and select only the files with merge status (these are the unchanged files; merge, edit are edited files and merge, branch are new files). Just click Undo Changes with just those selected, and then enjoy the beauty of an uncluttered merge changeset.

Example

For more detail you could also take a look at broken-e's answer in this question: Files listed as pending changes when doing merges that didn't change?

PatrickLu-MSFT
  • 49,478
  • 5
  • 35
  • 62