Step 2 leads to merge conflicts. Cheers, Alex
Cheers, Alex ________________________________ Von: David P Grove <[email protected]> Gesendet: Tuesday, April 21, 2020 6:26:13 AM An: [email protected] <[email protected]> Betreff: Re: [DISCUSS] Allow merge commits on github repos? I'm missing why merge commits to master are needed to solve the problem you are raising. 1. The first PR is merged with a `rebase and merge` 2. After updating your local master, you do a `git rebase master` to the second PRs branch and force push. --dave
