Changes between Version 50 and Version 51 of UpdatingBugzilla


Ignore:
Timestamp:
Feb 10, 2017 3:24:59 PM (7 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UpdatingBugzilla

    v50 v51  
    100100 It's important to check for unwanted changes that sometimes result from doing a grafted merge, such as duplicate code.  By comparing the changes from current `master` versus the changes in the current working directory to the release being merged to, one can be sure there are no unwanted changes.
    101101
     102 This frequently happens when changes are made for a point update on a branch that don't match a change to trunk.  The git merge then doesn't know that it needs to remove those changes, so one ends up with duplicate code, or conflicted code that's slightly different, even though there was no difference to the previous release version.
     103
    102104 * Locate any customize templates that no longer exist:
    103105{{{