Page History

...

1. In the SLAC Lab production repo, click "Pull Request" and then "New Pull Request"
   
2. Click on "Compare across forks" and then pick your fork in the left hand drop down menu
   
3. Click "create pull request", which will take you to the same page we had in the tutorial! The only difference here is that you don't need any reviewers because you're merging it into your personal fork.
   

4. You can just immediately merge it in on the next page by clicking "merge pull request"
   Image Modified
   
   

   Info
   Sometimes it'll say that it can't be merged automatically. This usually happens when you've edited the same file as one that got updated in production. One way to avoid this problem on GitHub is to always keep your fork's master up to date with production and do all your work in a different branch and just deal with the merge conflicts locally

5. Using the steps in the tutorial, ssh into rhel6-64 and navigate to the repository you created with Matt's script and run "git --bare fetch origin master:master". Mine doesn't have output because it's already up to date, but yours should
   
6. Back in your physics devPanel directory, run "git pull origin master", and that should be it! Again, your output will be different from mine because mine is already up to date.
   

...

Assuming that you trust the custodian of the local production copy to keep it up to date, this method is probably the easiest.

1. In your physics devPanel directory, run "git remote add upstream ~/opsTools/devPanel"
   Image Modified
2. Now you can just run "git pull upstream master" whenever you'd like to bring your local copy up to date with production!
   Image Modified

...

Pulling from the SLAC Lab Production Copy

If you don't trust the custodian of the local production copy to keep it up to date, then you can connect your bare AFS repo directly to SLAC Lab's production repo.

1. Using the steps in the tutorial, ssh into rhel6-64, navigate to the bare repo you created with Matt's script, and run "git remote add upstream git@github.com:slaclab/devPanel.git" (gotten from the SLAC Lab devPanel page, much like we got it for our personal forks in the tutorial)
   Image Modified
   Image Modified

1. Now, similar to in the GitHub method, you should run "git --bare fetch upstream master:master"  (yes, I have an error message, but it's for stupid reasons. Yours should be fine)
   Image Modified
2. And now it's the same step as in the GitHub method, running "git pull origin master" from your devPanel physics directory.

Those last two steps Steps 2 and 3 will need to be run every time you want to update.