Update VVC Software Development Workflow authored by Frank Bossen's avatar Frank Bossen
...@@ -144,7 +144,12 @@ A merge request may be updated as follows: ...@@ -144,7 +144,12 @@ A merge request may be updated as follows:
2. Make the necessary corrections and repeat the git add/commit/push commands described in section 4. 2. Make the necessary corrections and repeat the git add/commit/push commands described in section 4.
3. The merge request is then automatically updated when the push command is applied. 3. The merge request is then automatically updated when the push command is applied.
**Note:** There is no need to close the request, because the existing request will automatically be updated with the changes, after they are pushed. **Note:** There is no need to close the request, because the existing request will automatically be updated with the changes, after they are pushed.
**Note:** If a rebase operation (git rebase) is done in step 2 a forced push may be required:
```
git push origin --force
```
Keeping your fork in sync Keeping your fork in sync
------------------------- -------------------------
...@@ -183,3 +188,4 @@ git stash ...@@ -183,3 +188,4 @@ git stash
git rebase master git rebase master
git stash apply git stash apply
``` ```