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?

Temas

Etiquetas

Idioma

English

preguntada hace 9 meses365 visualizaciones

1 Respuesta

¿Son útiles estas respuestas? Vote a favor de la respuesta correcta para ayudar a la comunidad a beneficiarse de sus conocimientos.

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

EXPERTO

respondido hace 9 meses

Mark
hace 9 meses
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".

Contenido relevante