Changes between Version 10 and Version 11 of org/teams/NetworkTeam/MergePolicy


Ignore:
Timestamp:
Apr 17, 2019, 8:26:42 AM (4 months ago)
Author:
teor
Comment:

Add more info about merge commits

Legend:

Unmodified
Added
Removed
Modified
  • org/teams/NetworkTeam/MergePolicy

    v10 v11  
    458458  * add a commit with the new required changes, on the earliest maint branch that needs the change.
    459459
     460  Don't put semantic changes in merge commits. Instead, put them in a new commit after the merge commit.
     461
    460462  So we should be able to merge all these branches in the right places,
    461463  then merge forward without conflicts.