Databases
StackOverflow2013
Postsdbo
POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
    primarykey
    data
    text
    <p>Lets say I have a feature branch named "branches/BigFeature". I want to push those changes to the Trunk, make some changes to Trunk and merge back it all back into the "BigFeature" branch so development can continue.</p> <p>My steps were to:</p> <ol> <li><p>Merge the latest changes in Trunk to branches/BigFeature. (Tortoise SVN -> Merge a range of revisions)</p></li> <li><p>Merge the changes in branches/BigFeature to Trunk. (Tortoise SVN -> Reintegrate a branch)</p></li> <li><p>Make some changes to Trunk.</p></li> <li><p>Merge the changes in Trunk to branches/BigFeatures. (Tortoise SVN -> Merge a range of revisions)</p></li> </ol> <p>The problem arises in step 4. When I merge back to BigFeature I get all kinds of conflicts. It seems to have a problem with files that were originally added in branches/BigFeature but were merged to the Trunk.</p> <blockquote> <p>The message it gives me is "The last merge operation tried to add the file 'blah' but it was already added locally.</p> </blockquote> <p>This kinda makes sense because the file was originally added in the branches/BigFeature branch and then merged to Trunk. But why can't the merge operation realize this? Why is it coming up as a conflict?</p> <p>The same kind of error happens for deleted files.</p> <blockquote> <p>The last merge operation tried to delete/move/rename the directory 'blah', but it was deleted, moved or renamed locally.</p> </blockquote> <p>Thanks for you help.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USJustin
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COSVN merge in general doesn't work well.
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. USalternative
    2. COAre there alternatives?
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. USJustin
    3. COAnyone who says svn merge doesn't work isn't doing it right. Svn's conceptual view of changes isn't the best (later SCMs such as git got it a little closer to the mark), but it's not true at all that one can't do merges with subversion or even manage a complicated codebase with merges coming in and out.
      singulars
      1. POWhy do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?
      1. USEther
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload