![]() The order in which we should merge or stacked PRs is completely subjective. It depends on how you want the merge commits to look on master. Squashing and rebasing both overwrites Git’s history (albeit in different ways), removing the overlap that deemed the two branches continuous. Git knew to do so because it saw a commit with the same metadata on the two branches. If you recall, changing the base from master to ts-setup shaved off the common commit between ts-setup and migrate-components. Git tracks changes through commits by commit hashes. ![]() This restriction does not apply to the last PR on a given PR chain. The only restriction you have on merging while working with stacked PRs is that you cannot “squash and merge” or “rebase and merge.” You must merge directly. The worst-case scenario is someone merging a PR, pulling master, not finding the changes, and getting confused, which begs the question, how do you merge stacked PRs? How to merge stacked pull request Squash, merge, or rebase?
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |