3

I've run into this issue before, thought nothing of it too much, but it is getting quite tedious.

We have the following. A main branch, which is the stable release that our users are using. We have a development branch, which hosts our fixes that we can release at a moments notice. Then we have our features branches, which have the features that are WIP. For simplicity, I will only go on about the latter two - Development, and a feature branch named Quoting.

Structure

The Quoting branch has had it's feature finished. It's had the development branch merged into it and all the conflicts have been resolved on the quoting branch. Now, we have the latest on the quoting branch, and the latest work on the development branch. All in all, there's only something like 20-30 files changed.

Differences One Differences Two

So I'm about to merge back into the development branch, and I follow the prompts - pretty straightforward:

Prompt 1 Prompt 2

Now here is where I hit a bit of a roadblock. I get a list of included changes that counts well above 30; nearly every single file is being merged!

Pending Changes

So I followed a StackOverflow post that suggested that right-clicking and undoing changes, but pressing No To All on the confirmation dialog would help. Unfortunately, I skipped the comments that said This works when you only have changes to files. It will not merge any NEW files that you have added.

So my question is, how do I go about getting all the actual pending changes, without having to go through item by item and excluding what I've worked on, so I can undo the pending changes and re-include my changes, to simply do a merge? Could this all be caused by the fact I renamed the branch as per some comments on StackOverflow and the web, even though the hierarchy is all the same?

Community
  • 1
  • 1
DeeKayy90
  • 837
  • 1
  • 13
  • 27
  • Just as an FYI, I have performed the merge by going through all the changes in the list and comparing to the comparison in the pictures provided. I believe it could be related to the fact I renamed the branch, but that was some time ago and since then I have merged from Dev to Quoting with no issues. – DeeKayy90 Nov 30 '15 at 06:31

1 Answers1

3

In fact, this is caused by the renamed branch. When you Rename a branch in Source Control, it will delete the previous one and create a new one. Even though the hierarchy is all the same , but the branch is tollay different. You can view your old branch by "show deleted items in Source Control".

enter image description here （For this case change Main branch to Main123 branch）

So in TFS, it shows [merge] status for the unchanged file and shows[merge,edit]status for the files that actually changed and shows[merge branch] for the new add item.

For your situation, there is no better way which you can simply do a merge. Moreover, strongly suggest you don’t rename the branch directly, unless this is really necessary. It would also mess up your changeset history.You would be best creating a new branch with in tact history.

Community
  • 1
  • 1
PatrickLu-MSFT
  • 49,478
  • 5
  • 35
  • 62
  • Hi @Patrick-MSFT, thank you for your answer. I thought this was the cause also, as when I was looking into it further, I noticed that it had done what you said - deleted the previous, and created a new branch. We have since simply checked in the existing code, resolved the conflicts and gone through each file to make sure there was nothing that needed to be changed. I have also made a note to not change a branch name, if a new name is needed, simply perform a new branch. – DeeKayy90 Dec 02 '15 at 00:14
  • I've just come across the same behaviour after a commit, rollback to branch A, then merging the originaly committed change from branch A into branch B, then merging the committed changes from B back into A - files disappeared. 100% reproducible. – Owl Jul 12 '17 at 10:11