I’ve successfully cloned v0.5, branched to ‘gordon’ and checked it out to my local machine…How do I pull the latest updates from either v0.5 or someone else’s?
The wiki just has ‘git pull’ which isn’t enough information for me (I am only familiar with basic svn functionality/commands) and didn’t quite understand what Git help pages I’ve read so far on how to update to the latest revision of code on Git.
Got an example?
I’ll update the WIKI when I more fully understand some of these basic Git functions better.
I followed the tutorial at [http://github.com/guides/keeping-a-git-for...the-forked-repo](http://git%20remote%20add%20wycats%20git://github.com/wycats/merb-core.git).
First you need to add the main repository to your remote references (this only needs to be done once):
git remote add elan git://github.com/elan/plex.git
After that, you can pull the latest updates:
git checkout gordon<br />
git pull elan v0.5
If any merge conflicts happen, you'll need to manually resolve them. You can use:
git mergetool
to start Apple's diff tool for each file with conflicts.
Hope that helped :)
This topic was automatically closed 90 days after the last reply. New replies are no longer allowed.
