The delang is using merge instead of rebase/squash
Martin Nowak via Digitalmars-d
digitalmars-d at puremagic.com
Fri Mar 24 09:34:46 PDT 2017
On Tuesday, 21 March 2017 at 20:16:00 UTC, Atila Neves wrote:
> git rebase master my_branch
> git checkout master
> git merge --no-ff my_branch
Yes, that's about what we aim for, rebase w/ --autosquash though,
so that people can `git commit --fixup` new fixup commits to open
PRs w/o leaving noise behind.
https://github.com/dlang-bots/dlang-bot/issues/64
Requires a local checkout of the repo which the bot doesn't have
atm.
More information about the Digitalmars-d
mailing list