|Subject:||Merge to main trunk issues...|
|Date:||Wed, 5 Mar 2008 11:52:14 -0800|
We have some new files added to a branch a few branches down off of the trunk.
The revision number for one of those files is: 126.96.36.199.188.8.131.52
We merged the new files back to the trunk. When we did this the files were given a revision number of:1.2
Now there is parallel development going on – on both the branch and the Main trunk.
When ever I try to merge the only result I can get is either the entire revision 184.108.40.206.220.127.116.11 replacing 1.2 or an error message stating that the file “already contains the differences between 18.104.22.168.22.214.171.124 and 1.2”
Any help would sincerely be appreciated.
|[Prev in Thread]||Current Thread||[Next in Thread]|