CodeCommit: Pull Request: How to rebase before merge?

Before merging pull request via CodeCommit's Pull Request feature, I'd like the branch to be rebased to the target branch.

The goal: Retain a clean and easy-to-read commit history with no-ff-merging.

How do I do that? Would I need to manually rebase via CLI and run a new pull request?

Themen

Tags

Sprache

English

gefragt vor 9 Monaten367 Aufrufe

1 Antwort

Sind diese Antworten hilfreich? Stimmen Sie der richtigen Antwort zu, damit die Community von Ihrem Wissen profitieren kann.

Hi,

You may want to read this very detailled article about git merge / rebase to define the right process for your use case: https://www.algolia.com/blog/engineering/master-git-rebase/

It provides different paths to create the proper commit history in your repo.

Best,

Didier

EXPERTE

beantwortet vor 9 Monaten

Mark
vor 9 Monaten
I appreciate the link. However, we already have a definition of how a commit history looks like. That definition says "rebase before merging and no squash commits".

Relevanter Inhalt