Working With the Remote Acquaman GitHub Repository - acquaman/acquaman GitHub Wiki

As an issue is being worked on, and changes committed to the local repository it is also necessary for the team member to push these changes to the remote. This ensures that a backup copy of the work done in the branch is always available, allows the potential for two people to be working on a single issue at the same time and enables peer review to take place on any code. Pulling from the repository will create/update the branch within your local repository, pushing will create/update the remote repository with whichever changes have been made locally.

Pushing an Issue from Local to Remote

• Navigate to the Acquaman development folder: cd beamline/programming/acquaman
• Ensure you're on the correct branch you wish to push: git branch
• If you are on the correct branch push your branch to the remote: git push origin Issue###, where Issue### is the name of the local branch. If the branch doesn't exist on the remote, then a new branch will be created which matches the specified name. It it does already exist, then the existing version will be updated with the changes made in the local version.

Pulling an Issue from Remote to Local

• On the machine which you wish to test the branch on, navigate to the Acquaman development folder in the build environment your beamline uses for building Acquaman cd beamline/programming/acquaman
• Create a new local branch which mirrors your issue branch currently on the remote: git checkout -b Issue### origin/Issue### where Issue### is the branch name you wish to get from the remote. If git complains about what you're doing here, you may need to run git fetch first.
• Build, run and test using the procedure used by your beamline.