Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
AMC13 Software Development workflowOverview of the workflow | ||||||||
Line: 16 to 16 | ||||||||
Simply go to the main repo site: https://gitlab.cern.ch/syuan/amc13![]() | ||||||||
Changed: | ||||||||
< < | git clone ssh://git@gitlab.cern.ch:7999/cms-cactus/svn2git/software/boards/amc13.git | |||||||
> > | git clone ssh://git@gitlab.cern.ch:7999/cms-cactus/svn2git/software/boards/amc13.git | |||||||
To switch to your branch, do: | ||||||||
Changed: | ||||||||
< < | git checkout -b <branch name> origin/<branch name> | |||||||
> > | git checkout -b <branch name> origin/<branch name> | |||||||
You can also do it from the command line: The same way to push a local branch to a remote branch. If the remote branch name does not exist, it will create a new one. | ||||||||
Changed: | ||||||||
< < | git push origin <new branch name> | |||||||
> > | git push origin <new branch name> | |||||||
Modify your local repository | ||||||||
Changed: | ||||||||
< < | Modify the files as you wish. If you created new files or directories, use | |||||||
> > | Modify the files as you wish. If you created new files or directories, use the following command to track them:
git add <path>Commit the modification to your local repository: git commit -m <msg>Where <msg> is a short description of the changes you made Push changes to remote branchgit push origin <branch name> Create a merge requestAt the left side of page click "Merge Request", select the branch you want to merge from and the branch you want to merge to. Usually it's from your own branch to the master branch. You can assign approvers to have people check and approve your code before they get merged into the master branch, but it's not required. After you created the merge request, maintainers will see it and can merge it. | |||||||
-- ![]() |
Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
| ||||||||
Changed: | ||||||||
< < | AMC13 Software Git related procedures | |||||||
> > | AMC13 Software Development workflowOverview of the workflow | |||||||
Changed: | ||||||||
< < | Under development | |||||||
> > | The recommended way to make change to the AMC13 software is as follows:
Create a branch on the main repoYou can do it through the web page: Simply go to the main repo site: https://gitlab.cern.ch/syuan/amc13![]() git clone ssh://git@gitlab.cern.ch:7999/cms-cactus/svn2git/software/boards/amc13.gitTo switch to your branch, do: git checkout -b <branch name> origin/<branch name>You can also do it from the command line: The same way to push a local branch to a remote branch. If the remote branch name does not exist, it will create a new one. git push origin <new branch name> Modify your local repositoryModify the files as you wish. If you created new files or directories, use | |||||||
-- ![]() |
Line: 1 to 1 | ||||||||
---|---|---|---|---|---|---|---|---|
Added: | ||||||||
> > |
AMC13 Software Git related proceduresUnder development --![]() Comments |