{"id":4363,"date":"2006-02-06T13:46:00","date_gmt":"2006-02-06T13:46:00","guid":{"rendered":"https:\/\/blogs.msdn.microsoft.com\/buckh\/2006\/02\/06\/baseless-merges-now-record-history\/"},"modified":"2006-02-06T13:46:00","modified_gmt":"2006-02-06T13:46:00","slug":"baseless-merges-now-record-history","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/buckh\/baseless-merges-now-record-history\/","title":{"rendered":"Baseless merges now record history"},"content":{"rendered":"<p>Back in June, I wrote a <a href=\"\/buckh\/archive\/2005\/06\/18\/430449.aspx\">post on using baseless merges to establish a merge relationship<\/a> between two items where neither was branched from the other.&nbsp; A week after I posted it, I had to go back and change it to say that baseless wouldn&#8217;t record merge history for v1, and thus you would only be able to merge items where one was a branch of the other.<\/p>\n<p>I&#8217;m happy to say that&#8217;s been fixed both for the RC (<a href=\"\/jeffbe\/archive\/2006\/02\/04\/524661.aspx\">available tomorrow<\/a>) and RTM (<a href=\"\/robcaron\/archive\/2006\/01\/31\/520423.aspx\">available in March<\/a>)!<\/p>\n<p>So, if you have two folders, projectX and skunkWorksX, where neither is a branch of the other, you can establish a merge history between the two by running &#8220;tf merge \/baseless projectX skunkWorksX \/r&#8221; (or you can re-order the source and target, according to the direction in which you want to initially move changes).&nbsp; When you are done resolving the conflicts and check it in, you will be able to merge normally between the two with &#8220;tf merge projectX skunkWorksX \/r&#8221; or &#8220;tf merge skunkWorksX \/r&#8221; depending upon which&nbsp;direction you need to propagate changes.<\/p>\n<p>In v1 you have to use the command line to perform baseless merges.&nbsp; Also, items that did not originally have a branch relationship will not show up in the Source Control Explorer in VS as able to be merged (you&#8217;ll have to use the command line).&nbsp; Those are pretty minor tradeoffs for a really useful feature, though.<\/p><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Back in June, I wrote a post on using baseless merges to establish a merge relationship between two items where neither was branched from the other.&nbsp; A week after I posted it, I had to go back and change it to say that baseless wouldn&#8217;t record merge history for v1, and thus you would only [&hellip;]<\/p>\n","protected":false},"author":94,"featured_media":10268,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[1],"tags":[6,8],"class_list":["post-4363","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized","tag-source-control","tag-team-foundation"],"acf":[],"blog_post_summary":"<p>Back in June, I wrote a post on using baseless merges to establish a merge relationship between two items where neither was branched from the other.&nbsp; A week after I posted it, I had to go back and change it to say that baseless wouldn&#8217;t record merge history for v1, and thus you would only [&hellip;]<\/p>\n","_links":{"self":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts\/4363","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/users\/94"}],"replies":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/comments?post=4363"}],"version-history":[{"count":0,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/posts\/4363\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/media\/10268"}],"wp:attachment":[{"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/media?parent=4363"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/categories?post=4363"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/devblogs.microsoft.com\/buckh\/wp-json\/wp\/v2\/tags?post=4363"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}