[pull] master from atom:master

[pull]

See Commits and Changes for more details.

---

Created by pull[bot]. Want to support this open source service? Please star it : )

[DeeDeeG]

Is this right? I see Pullbot is set up to do rebases in the config file.

I think merge commits is slightly nicer, but that's just my take. Rebasing us on top of upstream would make some sense as well. I think it's rebasing upstreams new commits on top of ours, which works too, but it causes our commit histories to diverge. So it's kind of messy to compare the fork to upstream after a while.

[aminya]

It supposed to rebase, but the timing has not been correct. 🤔 We can try merge or squash instead.
https://github.com/atom-ide-community/atom/blob/master/.github/pull.yml#L5

I will fix the master changes.

[DeeDeeG]

Here's the docs for the pull bot, I'm taking a look at them to see what the options are: https://github.com/wei/pull#readme

There might also be something we can use (App or Action) in the GitHub Marketplace. Or if it's easy enough, write our own that does what we want. https://github.com/marketplace

[aminya]

There are a bunch of other bots here:
https://github.com/marketplace?query=fork

I think that the pull bot is able to detect if we are behind by comparing. The GitHub counter is not a good representation.

[DeeDeeG]

We can try that other app and see what happens.

Also: This is an action I found that could do all of it, but I don't think you can run it every time upstream updates, so you'd have to run it on a schedule or something like that: https://github.com/marketplace/actions/github-sync-to-upstream-repository

---

For rebasing our repo every time upstream master updates: I'm pretty sure a two-step process would work:

1. Have an app or action keep upstream_master here up to date with master at the upstream repo
   1. The pull bot app we're already using would work for this.
2. On any push to our upstream_master branch, rebase our master on top of our upstream_master.
   1. This action seems like it should work.

Looking into the exact apps/tasks to use; I know we can use the pull bot we already have for keeping upstream_master up to date. I'm looking for options for the rebase step, and considering whether to just write one myself if I can't find one.

I'm still learning GitHub Workflows, so setting up an action will take a bit more reading: https://docs.github.com/actions