Add upstream & upstreamfr commands#118
Add upstream & upstreamfr commands#118luzzardik wants to merge 3 commits intoAventiumSoftworks:masterfrom
Conversation
I'll use the https link for the original repo, but I doubt Github requires authentication for SSH based pulls on public repositories.
Yup, good idea, will change, will call them
In my opinion, we should leave this command to force users to pull from their fork. Preventing them from even more merge conflicts than necessary that could be a mess to handle for a beginner with git.
They're signed, I need to verify my new e-mail on Github, but as any good tech enthusiast out there, I play too much with my personal domain DNS configuration. 😂 Will fix ASAP. Edit: my bad, they're not. Will sign them. |
They actually do require an SSH key to be linked to a GitHub account
I've seen a lot of people cloning the repo then pushing to a non-fork repo, thus rewriting the branch name. Imho it would cause more confusion than anything else. I can't see how it would cause less merge conflicts tho. |
1728c79 to
ceb4b61
Compare
Signed-off-by: Kacy Luzzardi <him@luzzardik.net>
ceb4b61 to
b6b6f0e
Compare
Using HTTPS rather than SSH now.
Renamed !
Read some docs, yup, useless.
Signed all my commits, still shown as "Unverified" on GitHub due to Vigilant mode (still need to verify my email address, will do so ASAP). |
fc62ac8 to
24d7e05
Compare
| "fields": [ | ||
| { | ||
| "title": "1.", | ||
| "description": "First, you'll need to add the original repo as a remote origin. If you already done so, you can skip this step.\n`git remote add upstream https://github.com/dscalzi/HeliosLauncher.git`" |
There was a problem hiding this comment.
You should mention they need to skip this step if Git says there's already an origin named Upstream
There was a problem hiding this comment.
Isn't "If you already done so, you can skip this step." enough ? ^^'
There was a problem hiding this comment.
Probably, but you should mention git might setup upstream by default, mainly if the users are using GitHub Desktop
Hi,
This PR adds the
/upstreamand/upstreamfrcommands which answers with a guide on how to update a Helios Launcher fork from the original repository.