{"id":131,"date":"2006-09-24T10:33:15","date_gmt":"2006-09-24T14:33:15","guid":{"rendered":"http:\/\/www.rakkar.org\/blog\/?p=131"},"modified":"2006-09-24T10:33:15","modified_gmt":"2006-09-24T14:33:15","slug":"sourcegear-vault-does-not-support-merge-conflict-resolution","status":"publish","type":"post","link":"https:\/\/rakkar.org\/blog\/index.php\/2006\/09\/24\/sourcegear-vault-does-not-support-merge-conflict-resolution\/","title":{"rendered":"Sourcegear Vault does not support fixing merge conflicts."},"content":{"rendered":"<p>\t\t\t\tI found a problem with <a HREF=\"http:\/\/www.sourcegear.com\/vault\/\">Vault<\/a> which is that, when a merge conflict arises, I can&#8217;t edit the code generated by the resultant conflict.  My only choice is to accept or reject parts of the code.<br \/>\n<a href=\"http:\/\/support.sourcegear.com\/viewtopic.php?t=6834&#038;highlight=\">Forum post<\/a><\/p>\n<p>This simple case illustrates the problem:.<\/p>\n<p>Lets say I have a released function as follows:<br \/>\n<code>void func1(int numbre);<\/code><\/p>\n<p>I fixed the spelling in a branch:<br \/>\n<code>void func1(int number);<\/code><\/p>\n<p>I add a parameter to that function in the released version:<br \/>\n<code>void func1(int numbre, bool b);<\/code><\/p>\n<p>Obviously no tool can figure this out automatically so a merge conflict arises.  The proper solution for the branched version is to have both the &#8220;bool b&#8221; parameter and the correctly spelled variable.<br \/>\n<code>void func1(int number, bool b);<\/code><\/p>\n<p>However, the only option I&#8217;m given is to use the released version.<br \/>\n<code>void func1(int numbre, bool b);<\/code><\/p>\n<p>I have no way to edit text in the merge resolve tool.  Even something as limited as saying &#8220;CONFLICT HERE&#8221; and saving out the file would help.  But there&#8217;s no support for that.  My only option is to save the incorrect file, fix the conflicts myself, and then merge later, which takes 10X longer than simply changing a variable name.  This is doable but pretty unacceptable considering that Perforce does let you edit code and that conflict resolution is a fundamental feature of a source control application.    I could use it by myself, but for a large company?\t\t<\/p>\n","protected":false},"excerpt":{"rendered":"<p>I found a problem with Vault which is that, when a merge conflict arises, I can&#8217;t edit the code generated by the resultant conflict. My only choice is to accept or reject parts of the code. Forum post This simple case illustrates the problem:. Lets say I have a released function as follows: void func1(int [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[3],"tags":[],"_links":{"self":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts\/131"}],"collection":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/comments?post=131"}],"version-history":[{"count":0,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts\/131\/revisions"}],"wp:attachment":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/media?parent=131"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/categories?post=131"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/tags?post=131"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}