Skip to content

Changes

Page history
Remove heading for 3.1 authored by Administrator's avatar Administrator
Hide whitespace changes
Inline Side-by-side
git-setup.md
View page @ e3ec6ca3
......@@ -41,17 +41,15 @@ git clone git@webis.uni-weimar.de:webisstud/wstud-clickbait-ws16.git
Both URLs can be looked up and copied from the project page in GitLab.
# 3.1 Updating Your Working Copy
To update an already cloned working copy with the latest changes from GitLab, use `git pull` to pull in the latest remote revision. `git pull` is a shortcut for `git fetch`, which retrieves the changes from the server, and `git merge`, which merges the fetched changes into your local working copy.
## 3.2 Pushing Changes, Note to CVS Users
## 3.1 Pushing Changes, Note to CVS Users
Please be aware that, unlike CVS or SVN, Git is a *distributed* version control system. That means that a `git commit` only commits into your local working copy. To push the changes back to our central GitLab instance, you have to use `git push` after committing your changes. It is strongly recommended to commit often and in small atomic units with meaningful commit messages. That way you document your work progress and create a comprehensible history. Once your work is finished or at the end of a work day, you can bulk-push all your commits back to the server with a single `git push` (of course you can push more often if you like).
# 3.3 Branching
# 3.2 Branching
Other than CVS, Git makes branching easy and cheap. It is therefore quite convenient to work with different branches once you have made yourself familiar with Git. Therefore, if you are feeling comfortable enough with Git already and are working on a larger new feature, you can create and switch to a new branch with `git checkout -b branchname`. When your work is finished, you can merge the changes back into the main branch with `git merge`. If the main branch has diverged in the meantime, you can incorporate the changes using `git rebase` before merging your feature branch back in. More information about [branching and merging](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging) and [rebasing](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) can be found in the free online Git book.
## 3.4 Further Resources
## 3.3 Further Resources
If you need further instructions on working with Git from the command line, you can find many good tutorials online, such as the following:
* [Git Book](https://git-scm.com/book/en/v2)
......