top | item 30712391

(no title)

notapenny | 4 years ago

It usually works out fine when you do a `git pull --rebase`, but not everyone does this or has it setup so pulling might have some nasty effects. Generally helps to consider a feature branch as a private branch. Don't push to other people's features without asking, don't fuck up other people's work.

discuss

OJFord|4 years ago

Everyone absolutely should configure that. (Git config pull.rebase true.)

Such an annoying mess it leaves otherwise. And CI is building 'merge branch master', on the master branch, great.

lambic|4 years ago

Are there any downsides to doing this? Why isn't it on by default?

mkesper|4 years ago

Combine with git config --global rebase.autostash for your own protection.

nyanpasu64|4 years ago

FWIW I set pull.ff to only, since I don't want merge commits or rebases happening without explicitly calling pull --rebase or --merge.

cpcallen|4 years ago

> And CI is building 'merge branch master', on the master branch, great.

How does one set this up in GitHub actions?