further changes authored by joha2's avatar joha2
......@@ -2,7 +2,10 @@
## Preliminaries
Add the original (upstream) repo to your remotes
We assume that you already forked the original repo and that
you cloned this fork to your local system. Since your original fork
is added as remote already, you don't care about that. But you have to
add the original (upstream) repo to your remotes, to stay up-to-date with it
```
git remote add upstream git_repo_you_forked_from
```
......@@ -24,7 +27,11 @@ directly into the opened PR. Therefore either the PR is merged immediately or yo
of the next section.
## The fork and branch workflow (for a single person)
...
For a more detailled description of this workflow please
visit http://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/
Typically one branch is used to implement exactly one feature. This makes
it easy to work together on the code without braking the master branch due to
an intermediate commit. Therefore a branch is referred also as feature branch.
## Working together on a single branch
...
\ No newline at end of file