I’m working with others on a paper written in LaTeX.\u00a0 It’s stored in a git repository.\u00a0 I figured it would be easy for all of us to track and merge each other’s changes this way.\u00a0 So my friend clones the repo, commits a change, and sends me an email to let me know.\u00a0 At this point, I thought, great, let’s grab his changes, review and merge them.<\/p>\n
I’m sure this is obvious and is documented elsewhere, but it wasn’t to me. It’s not conceptually different than two programmers sharing code, which I’m sure is one of the common usages of git.<\/p>\n
So I thought, well, I can just track his ‘master’ branch in my repo and merge the changes.<\/p>\n
# this doesn't work\r\ngit branch --track friend-master\/path\/to\/other\/repo master\r\n<\/pre>\nNo, this doesn’t work.\u00a0 I have to add my friend’s repo as a remote in my local repo first.<\/p>\n
#this works\r\ngit remote add friend \/path\/to\/other\/repo<\/pre>\nThis says “Hey, I’m interested in the repo at \/path\/to\/other\/repo , and from now on I’m calling it “friend.” Does this mean I can track the branch now?<\/p>\n
#not yet\r\ngit branch --track friend-master friend\/master<\/pre>\nNo, first I have to fetch the remote so that my local repo is aware of what branches exist there.<\/p>\n
#this grabs stuff from my friend's repo\r\ngit fetch friend<\/pre>\nSpecifying “friend” is necessary, because git will pull by your default repo if one is not specified (and your default is probably “origin”). At this point, we can track the branch and merge.<\/p>\n
git merge friend\/master\r\n<\/pre>\nSummary:<\/p>\n
git remote add friend \/path\/to\/other\/repo\r\ngit fetch friend\r\ngit merge friend\/master\r\n<\/pre>\nIt’s actually pretty simple. It might even be obvious, provided you already understand the way git works. Otherwise, you might find this useful.<\/p>\n","protected":false},"excerpt":{"rendered":"
I’m working with others on a paper written in LaTeX.\u00a0 It’s stored in a git repository.\u00a0 I figured it would be easy for all of us to track and merge each other’s changes this way.\u00a0 So my friend clones the … Continue reading