candoumbe / candoumbe/Pipelines

✨ Add option to choose between `git rebase` or `git merge`

Open
#172 0 comments 0 reactions 1 assignee Claimed by @candoumbe View on GitHub
area:workflow enhancement ✨
Dominant language
C#
Stars
10
Forks
1
Avg merge
1d 13h
Merged PRs (30d)
9

Description

**Is your feature request related to a problem? Please describe.**
Some repositories require linear history (i.e. no merge commits) but the default implementation of both `IGitFow.FinishHotfix` and `IGitFlow.FinishRelease` use `merge` commands. This causes commits / PRs to be rejected

**Describe the solution you'd like**
Add new setting` RequireLinearHistory` to make the pipeline choose between `rebase` or `merge which value should be :
- `true` : only perform `rebase` commands
- `false` : only perform `merge` commands

By default `RequireLinearHistory` will be `false`.

**Describe alternatives you've considered**
N/A

**Additional context**
Add any other context or screenshots about the feature request here.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.