Commit changes to central CLaMS repository
The develop version of CLaMS is available on the GitLab server https://jugit.fz-juelich.de:
git clone git@jugit.fz-juelich.de:clams/clams-git.git [target-directory]
Configure the author name and email address to be used with your commits (saved in ~/.gitconfig):
git config --global user.name "firstname lastname" git config --global user.email name@fz-juelich.de
Commit changes from your local repository to the central repository:
- Update changes from the central repository:
git pull
- Show branches:
git branch
- Create new branch and switch to it:
git branch branchname git checkout branchname
- Check your changes and commit:
git status git add [...] git commit
- Push the changes in your branch to the central repository:
git push --set-upstream origin branchname
Create merge request on https://jugit.fz-juelich.de:
- go to the project (clams-git / clams-support)
- select "Merge Requests" on the left side
- click on "New merge request" button
- select the source branch (your new branch) and the target branch (master) and click on the "Compare branches and continue" button
- add a title and a description to your merge request, select a user to review your merge request and click on the "Submit merge request" button
- After the branch is merged, you can update your master branch:
git checkout master git pull