I always track all PRs in my mind and I then determine the order in which I should take theirs and mine branches. Then the classes and modules do not 'touch' and commits are squashed and successfully rebased.
On Sun, Mar 18, 2018 at 9:28 PM, Michael Osipov <[email protected]> wrote: > Am 2018-03-18 um 21:26 schrieb Tibor Digana: > >> I always do it with interactive 'git rebase' in IntelliJ IDEA. >> If there is a merge conflict, the contributor creates a new PR which has >> happened maybe only once. >> The most of the time the repo could be successfully rebased on master >> HEAD. >> > > That's the right approach. I just wanted to emphasize *not* to rely on > GitHub's default behavior. I know that this can be changed in GitLab, maybe > infra can change this for us on GitHub too? Less hassle for everyone. > > > Michael > > On Sun, Mar 18, 2018 at 8:41 PM, Michael Osipov <[email protected]> >> wrote: >> >> Am 2018-03-18 um 20:28 schrieb Karl Heinz Marbaise: >>> >>> Hi Tibor, >>>> >>>> On 18/03/18 19:50, Tibor Digana wrote: >>>> >>>> Do you have permissions to close pull requests in our ASF Maven >>>>> projects? >>>>> >>>>> >>>> Are you allowed to do merge a pull request via GitHub ? >>>> >>>> >>> Please don't do that. GitHub will -- by default -- do a no-ff merge with >>> ugly and useless merge commits. You have either to explicitly say ff >>> merge >>> or do via shell. >>> >>> Michael >>> >>> >> >
