search

rust-lang / triagebot

Automation/tooling for Rust spaces
https://triage.rust-lang.org
Apache License 2.0
170 stars 75 forks source link

Fix docs-update creating merge commits #1710

Closed ehuss closed 11 months ago

ehuss commented 12 months ago

The docs-update job has been having problems with creating merge commits that are not wanted. I think this was caused by the recent force-pushes to the master branch of rust-lang/rust. I previously thought /merge-upstream was required to "pull" the changes from upstream, but in my testing it seems like that is unnecessary. I have heard in the past that GitHub forks are implemented in such a way that forks use the same underlying git object store. Thus, it seems like referring to a commit from upstream seems to "just work" without needing to do a pull.

ehuss commented 11 months ago

@Mark-Simulacrum Just checking to see if you'll have a chance to look at this?