Activity Team/Git FAQ: Difference between revisions
| Line 56: | Line 56: | ||
git pull git://git.sugarlabs.org/myproject/myproject-clone.git master | git pull git://git.sugarlabs.org/myproject/myproject-clone.git master | ||
===How do I select which branch I am working on?=== | |||
git checkout master | |||
git checkout sucrose-0.84 | |||
===How do I merge changes from master into a branch?=== | |||
git checkout sucrose-0.84 | |||
git rebase master | |||
=== Where do I put the .xo file for my project? === | === Where do I put the .xo file for my project? === | ||