Hi Papa,
So, basics, I will put this in lay person speak.
Commit - writes your changes to a local database. These changes are local i.e. only on your computer.
Push - any new changes you have to a remote repository, i.e. davidrbender/pcgen
Pull - any new changes into the current branch you are in.
Branches are like connected sandboxes. You can play in the sand and not affect the other sandboxes. Each sandbox is a copy of changes that came before you made your sandbox. This allows you to tinker and experiment without damaging your good code.
Your fork is built from the pcgen version of the repo. This is called the Upstream. This term is important since git allows you to pull updates directly from the upstream.
You can also create any number of remote repositories (other people who forked, or the upstream). This is meant to allow collaboration. You can make the upstream "pcgen" and make it a selectable remote.
Fetch - a copy of all the branches from a given repo. Until you use fetch, any branches (sand boxes) will not be seen, only master.
To contribute your changes, the standard is commit, push to your remote, and then github.com has a feature called pull request, abbreviated as PR, which allows you to say, "here is work I have done, please pull it into your repository".
I can include screen shots, but for tortoisegit, right click context menu in a repository will allow you to access the preferences, which allows access to creating new remotes.
Hopefully not too much information for you and in an easy to understand manner. Any questions just ask. Happy to help.
Cheers,
Andrew
I have a Windows 7, 64 bit machine. Downloaded GIT and TortoiseGIT and installed both.
Forked PCGen/pcgen on GITHUB to davidrbender/pcgen. Cloned this to C:\PCGenMyStuff\MyGit\pcgen on my machine. Only through Andrew's patience and guidance was this possible.
Couple of questions from a complete GIT novice.
1. When PCGen/pcgen gets updated, how do I update my GITHUB repository?
2. How do I update my local repository from my GITHUB repository?
3. How do I do the reverse of 1 & 2. ie. update my GITHUB repository from my local, and then update the master PCGen/pcgen repository?
thanks and please be gentle. I really do not understand push vs pull vs fetch vs whatever else.
-- david
Posted by: Andrew <drew0500@yahoo.com>
| Reply via web post | • | Reply to sender | • | Reply to group | • | Start a New Topic | • | Messages in this topic (2) |
No comments:
Post a Comment