emerson wrote:
emer...@emerson-desktop:~/workspace/branches/stable$ svn status modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java C modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java > local edit, incoming delete upon mergewhy is that? This is a simple delete , why does it show as a conflict? the file hasn't changed by any other revision that is part of the merge. Shouldn't it just remove the file locally or mark it for deletion? Can't I apply several revisions to commit afterwards together if one of them contains a deletion??
The message says it all: You have a local (ie in trunk) modification while the merge tries to delete that modified files. For you not to loose changes without knowing about it, SVN triggers a tree conflict. Only you, human, can decide what to do between keeping the file with the changes made in trunk, or accept the deletion that comes from the merge of the branch
