[QGIS-Developer] Update local branch with upstream from within github website

[Matthias Kuhn]

Hi Harrissou,

Making contributions to the documentation as easy as possible for everyone
is a very good goal.

I think for most people the "edit on github" button on the documentation
page should be the number one go-to place for edits discovered on the fly.
Normally this will open a new branch in your repository (yes, sometimes you
get a `patch-1` branch, but that's impossible to avoid this way as far as I
am aware of).
Random thought, maybe we could add a link next to it that a) explains that
we appreciate contributions and b) that there is no risk involved and any
change will be reviewed before it's published.

The fork sync with upstream looks like a good solution for people who have
commit rights on the main repository (like you do). As far as I can tell,
you need to set this up on your own repository and nothing that can be done
"centralized".

For debugging the failures I am afraid that this won't be possible just on
the basis of a mail. I'd need to be able to ask some questions
interactively, maybe we can find some time to share a screen?

Regards
Matthias


On Mon, Mar 15, 2021 at 11:39 AM DelazJ <delazj at gmail.com> wrote:

> Hi all,
>
> During the last QGIS Open Day, Rosa made a talk about how she became a
> docs contributor (if you did not see it, worth a watch [0]). One point
> raised by some attendees is the not-so-obvious way for beginners to have
> their branches (mainly master) aligned with the upstream repo. Actually a
> general issue with github web interface.
>
> I stumbled upon the "Fork Sync With Upstream" [1] github action few days
> ago and implemented the workflow in my fork [2]. Having no git tool on the
> main machines I work with, it's something I began to use and I see this as
> an easy opportunity to quickly be inline with upstream and contribute
> directly from within github website (and avoid those patch-xxx branches).
> Some runs at [3](*).
>
> Could this be of a greater interest, and something to set up in our repo
> (don't know how and I'm not a github actions guru)?
>
> (*) it works well on my qgis docs repo [4]. For the code repo, it works
> nicely with release-* but fails on master due to some workflows permission.
> I also would like to run "pull --rebase" but no success, yet. Any help
> would be more than welcome. Thanks.
>
> [0] https://www.youtube.com/watch?v=ckrAg6azip8
> [1] https://github.com/marketplace/actions/fork-sync-with-upstream
> [2] https://github.com/qgis/QGIS/compare/master...DelazJ:main2
> [3] https://github.com/DelazJ/QGIS/actions/workflows/sync_branches.yml
> [4]
> https://github.com/DelazJ/QGIS-Documentation/actions/workflows/branchUpdates.yml
>
> Looking forward,
>
> Regards
> Harrissou
>
> _______________________________________________
> QGIS-Developer mailing list
> QGIS-Developer at lists.osgeo.org
> List info: https://lists.osgeo.org/mailman/listinfo/qgis-developer
> Unsubscribe: https://lists.osgeo.org/mailman/listinfo/qgis-developer
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-developer/attachments/20210319/98533771/attachment.html>