What's the preferred workflow when contributing to open source projects

[soderluk]

I've tried to search this pretty much everywhere, but found no definite answer, and maybe someone else will find this useful as well.

I'm contributing to an open source project, I've created a fork, and set up jj to work on it. I've two remotes, origin (my fork), and upstream (the original repo). Now I want to synchronize the fork with the upstream, I can just go to GitHub and click Sync repo, and all is well.

Using command-line with git it would be:

git fetch upstream
git switch main
git merge upstream/main

What's the corresponding jj workflow when working with forks?

Would it be something like this:

jj git fetch --remote upstream
jj new main@upstream main

or should I just rebase:

jj git fetch --remote upstream
jj rebase -b main -d main@upstream

Thank you for this great project!

[martinvonz]

The equivalent to the git commands would be this:

jj git fetch --remote upstream
jj new main main@upstream

That's exactly what you wrote except that I swapped the two arguments to jj new so your fork's main branch becomes the first parent. You may or may not care about that.

You could instead rebase, as you said, but that's a discussion that's mostly unrelated to whether you git or jj. The first page I found when I just googled it was https://www.atlassian.com/git/tutorials/merging-vs-rebasing

[soderluk]

Great, thank you! Yeah, the whole rebase vs. merge is something out of scope for this. It's interesting that all the git-related workflows only mentions the merge commit, not rebasing, so that's why I was a bit unsure whether it's the right thing to do. I think rebasing is the way to go though, since jj makes it so easy.