<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Piero,<div><br></div><div>This is not a malfunction of SVN. Those lines appear when you do an update, in case of conflict. This conflict comes from the fact that you did modifications to the file <i>ui.rb</i> and that someone also did modifications to this file, in the SVN server (i.e. committed his modifications), on the same line(s). In this case, SVN do not know how to merge the two batch of modifications and tells you that by putting those lines, to present the different versions (local and in the SVN server) and by putting a "C" in front of the file name when the running the <i>svn update</i> command.</div><div><br></div><div>The best way to fix this, when you don't care about your local changes, is to run <i>svn revert ui.rb</i>. If you do care about your modifications, you have to manually merge the different versions of the conflicting lines and run a <i>svn resolved</i>.</div><div><br><div apple-content-edited="true"> <span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Georgia; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Georgia; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Georgia; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div><div><div><div><div><div>Best regards,</div><div>Mathieu</div><div><br></div><div>___________________________________________</div><div><br></div><div>Mathieu Godart</div><div><br></div><div>Skype: mathieu_godart</div><div>MSN: <a href="mailto:mathieu_godart@hotmail.com">mathieu_godart@hotmail.com</a></div><div><br></div><div><div>ASIC Integration Manager</div><div>Coolsand Technologies</div></div><div>___________________________________________</div><div><br></div></div></div></div></div></div></div></div></span></div></span></div></span><br class="Apple-interchange-newline"> </div><br><div><div>Le 3 déc. 08 à 08:04, Edoardo Galvagno a écrit :</div><br class="Apple-interchange-newline"><blockquote type="cite"><div><blockquote type="cite">you're like if commenting those lines is enough…<br></blockquote><br><br>oops! typo…<br>I meant "you're lucky…"<br>don't know what happened,<br>maybe it was just too late…<br><br>Edoardo<br><br><br>_______________________________________________<br>textmate mailing list<br><a href="mailto:textmate@lists.macromates.com">textmate@lists.macromates.com</a><br>http://lists.macromates.com/listinfo/textmate<br></div></blockquote></div><br></div></body></html>