oduce this behaviour. Any hints would be appreciated.
Regards,
Thomas
Von: Becker, Thomas [mailto:thomas.bec...@torex.com]
Gesendet: Dienstag, 26. Juli 2011 14:09
An: users@subversion.apache.org
Betreff: strange merge conflict wrt. keywords
Hi,
Hi,
We encountered a strange merge conflict:
A branch was created from trunk, nothing was ever committed to this
branch and this branch was never the source of a merge. After some time,
when merging from trunk to the freshly checked-out branch we got a text
conflict for a particular file.
