Skip to content

Conversation

analytically
Copy link
Contributor

  • Add rebase_strategy parameter for merge strategies
  • Add rebase_strategy_option parameter for strategy options (e.g., -Xtheirs)
  • Enables automated conflict resolution in rebase workflows
  • Update schema and tests

Implements #414

- Add rebase_strategy parameter for merge strategies
- Add rebase_strategy_option parameter for strategy options (e.g., -Xtheirs)
- Enables automated conflict resolution in rebase workflows
- Update schema and tests

Implements concourse#414

Signed-off-by: Mathias Bogaert <mathias.bogaert@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

1 participant