...
Note that the tutorial didn't say anything about updating your personal copy if the production copy gets updated by someone else. There are two ways to do this, and it's really your choice which one to do.
...
GitHub Method
- In the SLAC Lab production repo, click "Pull Request" and then "New Pull Request"
- Click on "Compare across forks" and then pick your fork in the left hand drop down menu
...
- 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.
| 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 |
- You can just immediately merge it in on the next page by clicking "merge pull request"
- 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
...
- 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.
...
Command Line Method
| Info |
|---|
| This will rely heavily on git remotes. If you'd like to learn more about them, check this out! |
...