Re: [platform-dev] Github workflow

[Rolf Theunissen <rolf.theunissen@xxxxxxxxx>]

Hi,

What comes to mind is 'origin' and 'upstream' repositories. Where 'origin' is your fork and the 'upstream' the forked repo.

Your workflow seems to fetch from 'upstream' (aka eclipse) and push to origin (aka me), after which a PR is made from 'orgin' back to 'upstream'.

With the right settings this might be able to set the default fetch and default push locations in EGit too.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork

https://stackoverflow.com/questions/9257533/what-is-the-difference-between-origin-and-upstream-on-github

Op di 22 mrt. 2022 om 11:13 schreef Mickael Istria <mistria@xxxxxxxxxx>:

Hi,

On Tue, Mar 22, 2022 at 10:46 AM Wim Jongman <wim.jongman@xxxxxxxxx> wrote:

1. Go to your fork and "Fetch upstream" [1]

Why do you need to do that? Particularly if you never use master/main?

FWIW, may workflow is

$ git fetch eclipse master

$ git checkout FETCH_HEAD

[... do changes ...]

$ git commit -m "My super fix (#123)"

$ git push me HEAD:refs/heads/issue-123

Create PR

If needed, improve, rebase, `git push me --force HEAD:issue-123`

Upon PR merge, just remove my issue-123 branch.

This allows to not care about the master/main branch in my fork. I can even happily delete it, and it gives me more guarantee to keep in sync!

_______________________________________________
platform-dev mailing list
platform-dev@xxxxxxxxxxx
To unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/platform-dev