[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Kiren Pillay <kirenpillay1_at_gmail.com>
Date: Wed, 18 Aug 2010 16:45:35 +0200


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.java
> local missing, incoming edit upon merge

How do I resolve this?

I tried marking them as resolved, and then thought of updating files by
using an svn update from the incoming branch, but I can't get this right. An
svn update causes the files to be skipped.

svn update svn://main-svn/
Skipped 'svn://main-svn/
Received on 2010-08-19 20:42:18 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.