... | ... | @@ -118,4 +118,34 @@ denying the request and indicating in a comment what needs to be fixed. |
|
|
A merge request may be updated as follows. First, make sure to be in the correct branch.
|
|
|
Then make the necessary corrections and repeat the git add/commit/push commands described
|
|
|
in section 4. The merge request is then automatically updated when the push command is
|
|
|
applied. |
|
|
\ No newline at end of file |
|
|
applied.
|
|
|
|
|
|
7. Keeping your fork in sync
|
|
|
----------------------------
|
|
|
|
|
|
To pull changes from the upstream jvet repository into your own fork, first switch to the master branch
|
|
|
```bash
|
|
|
git checkout master
|
|
|
```
|
|
|
Add the upstream repository to the list of remotes using
|
|
|
```bash
|
|
|
git remote add upstream https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_BMS.git
|
|
|
```
|
|
|
This needs to be done only once. Note that "upstream" in the above command is the name that
|
|
|
your are giving to the remote repository. This name is then used in the pull command:
|
|
|
```bash
|
|
|
git pull upstream master
|
|
|
```
|
|
|
where master is the name of the branch your are pulling.
|
|
|
|
|
|
The pulled changes can then be pushed to the copy of your fork that resides on the server:
|
|
|
```bash
|
|
|
git push origin master
|
|
|
```
|
|
|
|
|
|
If you are currently working on a branch named for example feature1, you can incorporate
|
|
|
the recent changes from master using
|
|
|
```bash
|
|
|
git checkout feature1
|
|
|
git rebase master
|
|
|
``` |