Re: Keeping the changelog
Posted by Dave_L on 1197054373
Before committing the new change log, did you update your working copy from the repository? I thought that SVN had the ability to deal with this kind of issue (people making different changes to the same file).
Basic Work Cycle
Resolve Conflicts (Merging Others' Changes)
This Post was from: https://www.impresscms.org/iforum/viewtopic.php?topic_id=593&post_id=5408