How to resolve "local missing, incoming edit upon merge"

Hi I'm merging from a branch into my project and I get the "local missing, incoming edit upon merge" conflicts for three files. svn status output: MM dao/SMSBundlesCostDAO.java ! C bean/SMSFlagBean.java > local missing, incoming edit upon merge ! C bean/PCHAutoTopUpIndBean.ja

Tree conflict question - diff

Hi I'm trying to merge my trunk into my feature branch. I'm coming up with a lot of expected tree conflicts (shown below). Is there an quick/shorthand way to diff this to see the differences between the copies? C business_services/main_servlet/src/main/resources/testconfigs/pams.properties

Re: "local add, incoming add upon merge" incorrect message

/main_servlet/src/main/resources/testconfigs/pams.properties@6896) . Is there any reason for this? I suspect its because we haven't been doing reintegrate merges until recently? Is there a way to stop this from happening in future? On Thu, Jul 26, 2012 at 11:18 AM, Kiren Pillay wrote: > Hi >

"local add, incoming add upon merge" incorrect message

Hi I picked up a strange one with "local add, incoming add upon merge". I thought that this message means I've added a copy of this file locally and my trunk version also added this file to it's tree. (svn 1.6). According to the svn info, the trunk version doesn't have the file. Is this correct be

Re: "local add, incoming add upon merge" incorrect message

, 2012 at 3:55 PM, Stefan Sperling wrote: > On Thu, Jul 26, 2012 at 11:53:16AM +0200, Kiren Pillay wrote: > > Hi > > > > I have an additional question: > > > > It looks like the latest version of both branches have exactly the same. > It > > looks like the co

Re: "local add, incoming add upon merge" incorrect message

at 7:25 PM, Stefan Sperling wrote: > On Thu, Jul 26, 2012 at 06:51:36PM +0200, Kiren Pillay wrote: > > Aslo, I am interested in why this V1-1-1-preprod branch causes the > > conflict. Could you maybe have a look at this snippet of the SVN log > where > > I suspect things we

Re: "local add, incoming add upon merge" incorrect message

Thanks Stefan, will try out the test repo. Your help is really appreciated :) Best Regards Kiren On Thu, Jul 26, 2012 at 10:16 PM, Stefan Sperling wrote: > On Thu, Jul 26, 2012 at 08:58:24PM +0200, Kiren Pillay wrote: > > Thanks Stefan, > > > > Is there no way out of th

svn conflict, svn info message incorrect?

Hi I've notices a change in the svn info output when I have a tree conflict. The left and right are from the same branch. Is this correct? (svn 1.7 client to 1.6 server). kiren@Pillay2:~/Documents/workspace-TRUNK/newServer$ svn info business_services/pams-bs-subscriber-account/src/main/java/za/co

Re: svn conflict, svn info message incorrect?

further commits. (I guess this would be safe to do if my merge was done correctly). What do you suggest is the best approach for this from your experience? Regards Kiren On Fri, Nov 9, 2012 at 1:02 AM, Stefan Sperling wrote: > On Thu, Nov 08, 2012 at 05:52:07PM +0200, Kiren Pillay wrote: &

Re: svn conflict, svn info message incorrect?

Hi Stefan, Thanks for the help! Regards Kiren On Fri, Nov 9, 2012 at 2:40 PM, Stefan Sperling wrote: > On Fri, Nov 09, 2012 at 10:44:57AM +0200, Kiren Pillay wrote: > > "--reintegrate" merge has worked like a charm for us so far, however the > > reason I didn

Can't synchronize branch with trunk

- Modified/home/kiren/Documents/workspace-QA/V2.1.0-work-package-B merge completed/home/kiren/Documents/workspace-QA/V2.1.0-work-package-B Regards Kiren Pillay

Re: Can't synchronize branch with trunk

Hi Bob, Its a standard merge command, that's why I haven't included it. Its a standard merge though, it should work as far as I know. Was wondering in what cases this issue would occur. I will try and get the logs for you. Regards Kiren On Fri, Mar 1, 2013 at 8:33 PM, Bob Archer wrote: > >