10,505
edits
Changes
Jump to navigation
Jump to search
Line 158:
Line 158: + + + + + + + + +
→Commits are not visible on git.sugarlabs.org event pages
Check that your email address on git.sugarlabs.org account page is the same like in [[Activity_Team/Git_Tutorial#Initialize_git_global_settings|global git settings]] or in local repository setting (if you set user.email once):
Check that your email address on git.sugarlabs.org account page is the same like in [[Activity_Team/Git_Tutorial#Initialize_git_global_settings|global git settings]] or in local repository setting (if you set user.email once):
git config user.email
git config user.email
===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.
git merge [your repository name] # This won't work
git pull [git://git.sugarlabs.org/[your project name]/[your repository name].git master # This will work
[[Category:Activity Team]]
[[Category:Activity Team]]
[[Category:FAQ]]
[[Category:FAQ]]