Skip to content
  • Joe Woodward's avatar
    Update bin/secpick to allow wait after failed cherry-pick · c6398807
    Joe Woodward authored and Joe Woodward's avatar Joe Woodward committed
    When running bin/secpick, often you'll find that the cherry-pick command
    fails and then you have to manually fix the issue and figure out which
    commands would have been run and run them yourself.
    
    This change pauses if the cherry-pick failed and instructs the user to
    fix the conflicts then run `git cherry-pick --continue` and then
    continue the bin/secpick script.
    c6398807