Changes between Version 8 and Version 9 of org/teams/NetworkTeam/MergePolicy


Ignore:
Timestamp:
Mar 25, 2019, 4:25:18 AM (16 months ago)
Author:
teor
Comment:

Add practracker instructions

Legend:

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

    v8 v9  
    247247     pushurl = "Don't push origin dummy!"
    248248
    249   To push now, I created an "upstream" branch so when I push commits upstream, I
     249  To push now, I created an "upstream" remote so when I push commits upstream, I
    250250  have to explicitly type in:
    251251
     
    255255  branch).
    256256
    257   To add the upstream branch properly:
     257  To add the upstream remote properly:
    258258
    259259   $ git remote add upstream https://git.torproject.org/tor.git
     
    314314  it.  If you are merging a patch that is a candidate for backport, move
    315315  the ticket into the earliest open milestone to which it applies.
     316
     317  Wait for the CI to finish on master.
     318  If the CI fails due to practracker errors, update the practracker exceptions file, and push master again.
     319  (practracker fixes don't need review.)
     320  Make a note on the trac ticket for the PR that caused the error.
    316321
    3173226. How do we create backport branches?