On Mon, Nov 14, 2016 at 6:59 AM, David Aldrich <david.aldr...@emea.nec.com> wrote:
> Hi Stefan > > Thanks for your reply. > > > a) you manually apply changes to trunk and the release branch > > One thing I've never been sure of with svn is whether manually applying > the same change (i.e. by edits not merges) on branch and trunk is a good > idea. Can that result in conflicts when merging later? > Merge tracking does not have a huge impact on the actual merge, it has an impact on what revisions are merged. So in a release branch, I do not think it would make a lot of difference either way. The one scenario were merge tracking might yield fewer comments is if you use it to merge a revision(s) today and then later on you decide to merge everything (or an overlapping revision range). Merge tracking will make that followup merge smart enough to not re-merge the revisions you already merged. So that can help have fewer conflicts. But that is not a very common or normal scenario for a release branch. >From a pure documentation/history standpoint, I think it is better if you make the change on one branch and then merge it to the other. But technically speaking, merge is kind of just a fancy editor process to make the same changes to the same files. With the addition that it also creates some metadata about the merge that can be nice to have for your records keeping. -- Thanks Mark Phippard http://markphip.blogspot.com/
