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.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/
mycompany.za/rms/za.co.mycompany.rms.app/branches/v1-0-0_qa/za.co.mycompany.rms.app.core/src/main/java/za/co/mycompany/rmsapp/bean/smsflagbean.j...@head
Skipped 'svn://main-svn/
mycompany.za/rms/za.co.mycompany.rms.app/branches/v1-0-0_qa/za.co.mycompany.rms.app.core/src/main/java/za/co/mycompany/rmsapp/bean/SMSFlagBean.java
'
