{"id":7993,"date":"2005-12-15T17:09:00","date_gmt":"2005-12-15T17:09:00","guid":{"rendered":"https:\/\/blogs.msdn.microsoft.com\/visualstudioalm\/2005\/12\/15\/understanding-merging\/"},"modified":"2019-02-14T17:53:34","modified_gmt":"2019-02-15T01:53:34","slug":"understanding-merging","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/devops\/understanding-merging\/","title":{"rendered":"Understanding Merging"},"content":{"rendered":"<p>Merging is the process of combining the changes in two distinct branches. A merge operation takes changes\nthat have occurred in the source branch and integrates them into the target\nbranch. Merging integrates all types of changes in the source branch including\nname changes, file edits, file additions, and file delete and undelete changes. If items have been\nmodified in both the source and target branches, you will be prompted to\nresolve conflicts.<\/p>\n<p>Merging can be conducted through Source Control Explorer, or from the command line using the Merge Command.<\/p>\n<h2>What Occurs During a Merge Operation<\/h2>\n<p>During a merge operation, the following actions occur:<\/p>\n<ul>\n<li>The merge will identify any added files or folders in the source\nbranch and try to add the corresponding items in the target branch. <\/li>\n<\/ul>\n<p>&nbsp;&nbsp;&nbsp;&nbsp;<b>Note<\/b>&nbsp;&nbsp; A namespace collision can occur if the item being added from the source branch\nshares an identical name with an item that has been added to the target branch. Team Foundation does not handle the resolution of this type of conflict;\nhowever, an error message is logged.<\/p>\n<ul>\n<li>The merge will review the history for each item in the\nsource branch that also exists in the target branch. For each item, changes\nthat were made in the source branch that do not exist in the target branch will\nbe merged to the target branch. If the item has already been modified on the\ntarget branch, a conflict will be detected.<\/li>\n<\/ul>\n<p>&nbsp;&nbsp;&nbsp;&nbsp;<b>Note<\/b>&nbsp;&nbsp; During a merge operation, you have\nthe choice of merging either specific versions of items, or all changes.<\/p>\n<h2>How to Merge Changes<\/h2>\n<p>Merge operations can be performed from either the Source Control Explorer or the\ncommand line using the Merge Command.<\/p>\n<h2>Merge History<\/h2>\n<p>The Team Foundation source control server keeps a historical\nrecord of all merges that have occurred. You can review this information from\nthe command line using the Merges Command.<\/p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Merging is the process of combining the changes in two distinct branches. A merge operation takes changes that have occurred in the source branch and integrates them into the target branch. Merging integrates all types of changes in the source branch including name changes, file edits, file additions, and file delete and undelete changes. If [&hellip;]<\/p>\n","protected":false},"author":125,"featured_media":45953,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[1],"tags":[],"class_list":["post-7993","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-devops"],"acf":[],"blog_post_summary":"<p>Merging is the process of combining the changes in two distinct branches. A merge operation takes changes that have occurred in the source branch and integrates them into the target branch. Merging integrates all types of changes in the source branch including name changes, file edits, file additions, and file delete and undelete changes. If [&hellip;]<\/p>\n","_links":{"self":[{"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/posts\/7993","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/users\/125"}],"replies":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/comments?post=7993"}],"version-history":[{"count":0,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/posts\/7993\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/media\/45953"}],"wp:attachment":[{"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/media?parent=7993"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/categories?post=7993"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/devops\/wp-json\/wp\/v2\/tags?post=7993"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}