10,579
edits
Changes
Jump to navigation
Jump to search
Line 161:
Line 161: − +
→Branch vs Repository
===Branch vs Repository===
===Branch vs Repository===
When you make a clone of a project on gitorious, it creates a "repository". You can see the list of repositories associated with a project by clicking on the Repository Tab. Branches are clones within a repository (created with git branch and accessed through git checkout). Git merge commands refer to branches, not repositories, so in order to merge a repository back into mainline, you need to treat it more like a patch.
When you make a clone of a project on gitorious, it creates a "repository". You can see the list of repositories associated with a project by clicking on the Repository Tab. Branches are clones within a repository (created with git branch and accessed through git checkout). Git merge commands refer to branches, not repositories, so in order to merge a repository back into mainline, you need to pull it as if it were a patch.
git merge [your repository name] # This won't work
git merge [your repository name] # This won't work