TFS difference between [merge] and [merge,branch]
gbs
I have this branching structure in TFS 2013. 
Now I had a folder already in my Main branch called Websites.
I added a project TestProject in my Dev branch under Websites folder. Now when I merge Project from Dev to Main branch, it shows these in the pending Checking window.
There is [merge] next to Websites folder. I get that I am merging some stuff into Websites folder.
But for all other folders and documents I have in the project I added, it shows [merge, branch] above.
What does that 'branch' indicate and what is it's importance? Am I doing something wrong there?
jessehouwing
If it just shows [Merge] then there was a previous relation between the source and the target file or folder.
If it shows [Merge, Branch] it means that a new relationship has been created. This was most likely a new file or folder in the source branch.
Collected from the Internet
Please contact [email protected] to delete if infringement.
edited at
- Prev: Ding sound on pressing Enter
- Next: How to access a global service function within a twig extension using Symfony?
Related
Related Related
- 1
Difference between Forward Merge and Backward Merge
- 2
Difference between merge and create in Cypher
- 3
Why there are commits like "Merge branch 'master' of" in TFS
- 4
How do I merge a remote tfs branch into a git branch?
- 5
Difference between std::merge and std::inplace_merge?
- 6
What is the difference between `git merge` and `git merge --no-ff`?
- 7
Difference between git merge with commits in common and git merge with unrelated branches
- 8
Difference between std::merge and std::inplace_merge?
- 9
Difference between set with {merge: true} and update
- 10
Lodash - difference between .extend() / .assign() and .merge()
- 11
What is the difference between join and merge in Pandas?
- 12
Difference between git merge master and origin/master?
- 13
What is the difference between getHibernateTemplate().update and getHibernateTemplate().merge
- 14
GIT: Whats the Difference between a Pull Request and a Merge?
- 15
HOW to merge and get the difference between 2 datatable
- 16
Merge diff between two branches to third branch
- 17
Merge 2 branches in git ignoring branch in between?
- 18
Merge TFS changeset between branches rather than selecting files
- 19
Which TFS Permissions Need to be Denied to Prevent a Branch Appearing in the "Merge" Dialog?
- 20
Finding merge candidates in TFS
- 21
Revoking TFS Merge Credits
- 22
Finding merge candidates in TFS
- 23
TFS dividing merge into parts
- 24
TFS [merge] tag meaning in a code review of a merge
- 25
Is there a difference between git rebase and git merge --ff-only
- 26
What is the difference between Concurrent HashMap merge() and put() methods?
- 27
What's the difference between 'git merge' and 'git rebase'?
- 28
difference between git merge origin/master and git pull
- 29
What's the difference between merge / mesh and mergeArcs / meshArcs in topojson?
Comments