Announcement

Collapse
No announcement yet.

merging issue (overwritting no modified files)

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

  • merging issue (overwritting no modified files)

    Hi,

    I have an issue I cannot explain.

    We made a branch to enhance an old functionality. Meanwhile a file was updated by another programmer in the trunk. The file was not modified in the branch. Then we merged the branch in the trunk, starting from the Trunk working folder, using TortoiseSVN (Merge a range of revisions) . As result of merging the file in the branch modified back the file in the trunk copy, without any conflict.

    I am wondering how this can be possible. As I already mention, and as I can verify in the logs, the file was not modified in the branch. But the old copy overwrites the new one.

    Thank you,
    Sorin
Working...
X