Comments on: SVN: Merge a branch with your trunk http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/ May The Source Be With You. Wed, 07 Jan 2009 00:28:21 +0000 http://wordpress.org/?v=2.7 hourly 1 By: marc http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-10547 marc Mon, 23 Jun 2008 15:27:21 +0000 http://beta.ariejan.net/?p=64#comment-10547 thanks mate! so useful! thanks mate!
so useful!

]]> By: Ariejan http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-158 Ariejan Fri, 12 Jan 2007 11:03:32 +0000 http://beta.ariejan.net/?p=64#comment-158 @Tim: You probably had some merging conflict that Subversion couldn't figure out for itself. First run svn update and modify the file manually to merge changes manually. Next you should be able to complete the commit. @Tim: You probably had some merging conflict that Subversion couldn’t figure out for itself. First run svn update and modify the file manually to merge changes manually. Next you should be able to complete the commit.

]]> By: Tim http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-157 Tim Thu, 11 Jan 2007 15:17:15 +0000 http://beta.ariejan.net/?p=64#comment-157 fixed.. by removing the file.merge-left.rXX files in the same dir fixed..

by removing the file.merge-left.rXX files in the same dir

]]> By: Tim http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-156 Tim Thu, 11 Jan 2007 15:12:56 +0000 http://beta.ariejan.net/?p=64#comment-156 how to fix: svn: Aborting commit: '/path/file' remains in conflict i made manual changes but it won't commit how to fix:
svn: Aborting commit: ‘/path/file’ remains in conflict

i made manual changes but it won’t commit

]]> By: Ariejan http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-155 Ariejan Wed, 20 Dec 2006 13:35:40 +0000 http://beta.ariejan.net/?p=64#comment-155 Thanks. I'm working on it :) Thanks. I’m working on it :)

]]> By: klevo http://ariejan.net/2006/12/20/svn-merge-a-branch-with-your-trunk/comment-page-1/#comment-154 klevo Wed, 20 Dec 2006 12:41:22 +0000 http://beta.ariejan.net/?p=64#comment-154 You're doing a great job with these SVN tutorials! Please keep it coming :) You’re doing a great job with these SVN tutorials! Please keep it coming :)

]]>