Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
60ee0398
Commit
60ee0398
authored
Nov 05, 2016
by
Jakob Schöttl
Browse files
Update using-git.md
parent
185398a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Documentation/using-git/git-setup.md
View file @
60ee0398
...
...
@@ -52,11 +52,15 @@ The URLs for public and private repositories are:
For standard development and bugfixes, you can follow this workflow.
First, fork the public repository:

```
git clone
<url-of-public-repo>
git clone
git@gitlab.lrz.de:YOURUSERNAME/vadere.git
cd vadere
git checkout develop
git checkout -b
dev/
my-feature
git checkout
origin/
develop
git checkout -b my-feature
```
With this commands, you
...
...
@@ -65,10 +69,9 @@ With this commands, you
2.
checkout the development branch on which we are working.
(The
`master`
branch is reserved for stable releases.)
3.
checkout a new branch (based on
`develop`
) to work on a new feature.
(Note that the feature branch should start with
`dev/`
but cannot start with
`develop/`
.)
After you finished the new feature, go to GitLab, view your feature branch and create a pull/merge request.
The target branch must be
`develop`
, not
`master`
.
The target branch must be
`develop`
, not
`master`
, in the official Vadere repository
.

...
...
@@ -80,7 +83,7 @@ To work on a private project, you can follow this workflow.
If not already done,
1.
clone the public repository (see above).
1.
fork and
clone the public repository (see above).
2.
add the private repository as a remote:
`git remote add private <url-of-private-repo>`
Now proceed with:
...
...
@@ -108,7 +111,7 @@ Precondition: One person has set up a private branch (see previous section).
First, the co-worker has to do this steps (described in the previous section):
1.
C
lone the public repository.
1.
Fork and c
lone the public repository.
2.
Add the private repository as a remote.
Now, the co-worker proceeds with:
...
...
Documentation/using-git/gitlab-fork.png
0 → 100644
View file @
60ee0398
27.8 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment