[Infrastructure] GitHub Instructions on the Wiki

[Aaron Gable]

Agreed, I think GitHub's new "Fetch upstream" button basically just Does
The Right Thing. It probably has failure modes but I haven't run into them
yet.

On Sun, Oct 3, 2021 at 4:12 PM Ben Wilson via Infrastructure <
infrastructure at cabforum.org> wrote:

> Can we edit this part of the instructions
> <https://wiki.cabforum.org/github_redline_guide> accordingly?
>
> Delete Steps 1-6 under *2) Your repo is not in sync, and you can **automatically
> merge*, so it would read:
>
> If you see a message like, “This branch is 4 commits ahead, 10 commits
> behind cabforum:main”, then you need to click on “Fetch upstream.”
>
> I think "Fetch upstream" accomplishes these steps now, doesn't it?
> _______________________________________________
> Infrastructure mailing list
> Infrastructure at cabforum.org
> https://lists.cabforum.org/mailman/listinfo/infrastructure
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.cabforum.org/pipermail/infrastructure/attachments/20211005/c63bbd3a/attachment.html>