[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Branch to trunk merge scheduled new files for removal
From: |
simmo |
Subject: |
Re: Branch to trunk merge scheduled new files for removal |
Date: |
16 Nov 2005 09:33:26 -0800 |
User-agent: |
G2/0.2 |
No wonder I couldn't find anything on the web about this problem!
What I am pretty sure has occurred is that when I merged the trunk into
my branch everything worked fine and the files that I said earlier were
added after this merge were actually already in existence and were
brought across to my branch as well.
I then resolved my merge conflicts and committed my changes. However
this was where I went wrong - I commited my changes through netbeans
rather than at the command line, and the directory the new files were
added to was not part of my netbeans project. I later deleted all of my
branch code and checked it out again before doing the merge back into
the trunk which meant as far as CVS was concerned, I had deleted the
files on the branch.