jangofett287
Heat shield 'tester'
- Joined
- Oct 14, 2010
- Messages
- 1,150
- Reaction score
- 13
- Points
- 53
For what it's worth, I've generally found GitKraken to be the least worst GUI for git.
I'll try and explain:
"remote" is just a git server with a copy of the repo.
"fork" is GitHub's term for a copy of an existing repo on to a different account. This makes a new repo. GitHub keeps note of the connection and makes it visible in the "network" tab and also when creating pull requests.
"clone" is making a copy of a repo on your local machine
"origin" is usually the remote you cloned from
"upstream" is usually the remote you forked from. You may have to add this manually.
The recommended workflow is fork, clone, branch, commit, push (to origin, ie: your fork), pull request.
That works fine as long as that repository is only used by one person
Once "the source" (I think 'upstream' is the right term) of that copy is changed by another developer things get complicated in my head.
Another level of abstraction is the "fork" (github thing)...
So 1st I make a fork of martins repository - easy, one click,
Then I 'clone' (possibly wrong lingo) a local copy from my github repository...
while developing I like to "update" (possibly wrong lingo) my local copy with changes martin has made in the "original" repository...
That's where the 'remote' and 'upstream' things get confusing at first.
I would love to have a thread (single post) that would describe these steps for contributing to Orbiter[*].
[*] "How to provide a pull request to Orbiter"
I'll try and explain:
"remote" is just a git server with a copy of the repo.
"fork" is GitHub's term for a copy of an existing repo on to a different account. This makes a new repo. GitHub keeps note of the connection and makes it visible in the "network" tab and also when creating pull requests.
"clone" is making a copy of a repo on your local machine
"origin" is usually the remote you cloned from
"upstream" is usually the remote you forked from. You may have to add this manually.
The recommended workflow is fork, clone, branch, commit, push (to origin, ie: your fork), pull request.