Question：How to keep the commit history when merge PR into Repo?

#1

We develop the new sync-diff in feature branch. and we want to merge the feature branch into master. so what’s the best practice of this job?

#2

By contacting the admin of the repo, you can enable commiters(including tichi) to merge by rebasing. tide/merge-method-rebase tag will enable tichi bot to merge by rebasing instead of squashing. This way, you don’t bypass the CI system.

Note that it may take one hour for tichi bot to detect if it can merge by rebasing.

3 Likes