What is the difference between [merge] and [merge,edit] in visual studio 2013
Question
I have source code in the main. From this main i created a branche development. After changing the development branche i want to merge these changes back to the main. When i do this these changes are marked with [Merge,Edit] while i expect [Merge]. Can anyone explain this behavior?
2 answers
solution1
2 2015-10-28 07:25:32
(merge) means merge with no real change
(merge,edit) means merge with a change on the file in target with contents from source.
Nice readings on: What does it mean when Source Control Explorer shows both branch and merge for a changeset? Unfortunately no msdn pages...
solution2
1 2015-10-28 04:25:55
The merge status means that the revision contains a merge from another branch.
If a particular file is diffrent in the two branches, the file will have the status "merge, edit" because it is both merged from the branch and changed content.
After you perform your merge and check in it, a Conflicts Window appears.You must solve the confics of the file which has "merge,edit" status before check in.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.