Announcement

Collapse
No announcement yet.

No merge conflict for deleted folder

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • No merge conflict for deleted folder

    Baseline:
    • BranchA - FolderA contains FileA
    • BranchB branch from BranchA


    Commits:
    • BranchA - FileA move out of FolderA to root
    • BranchA - FolderA deleted
    • BranchB - FileA modified


    If I merge BranchA into BranchB I will not get any merge conflict. In BranchB the FolderA is deleted and FileA is not modified and I have miss the changed in FileA done in BranchB. Even If I have done the changes in BranchA in 1 or 2 commit the result is the same.

    If I merge BranchB into BranchA I will get a merge conflict as expected.

    What is best pratices about this merge situation?

  • #2
    The upcoming 1.8 release will detect this and raise a tree-conflict.
    http://subversion.tigris.org/issues/...ug.cgi?id=3150

    Comment

    Working...
    X