... | @@ -132,10 +132,13 @@ Keep all other settings as defaults. |
... | @@ -132,10 +132,13 @@ Keep all other settings as defaults. |
|
There may be one or more issues with a merge request resulting in SW coordinators
|
|
There may be one or more issues with a merge request resulting in SW coordinators
|
|
denying the request and indicating in a comment what needs to be fixed.
|
|
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.
|
|
A merge request may be updated as follows:
|
|
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
|
|
1. Make sure to be in the correct branch.
|
|
applied.
|
|
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.
|
|
|
|
|
|
|
|
**Note:** There is no need to close the request, because the existing request will automatically be updated with the changes, after they are pushed.
|
|
|
|
|
|
7. Keeping your fork in sync
|
|
7. Keeping your fork in sync
|
|
----------------------------
|
|
----------------------------
|
... | @@ -165,4 +168,12 @@ the recent changes from master using |
... | @@ -165,4 +168,12 @@ the recent changes from master using |
|
```bash
|
|
```bash
|
|
git checkout feature1
|
|
git checkout feature1
|
|
git rebase master
|
|
git rebase master
|
|
``` |
|
```
|
|
\ No newline at end of file |
|
|
|
|
|
**Note:** The above "rebase" command works only if the changes in feature1 are committed or stashed. Stash the work-in-progress changes in feature1 (if you are maintaining more than one stash please refer to documentation of stash to ensure stashes are not overwritten), rebase the master and the apply the stash back to your branch.
|
|
|
|
```bash
|
|
|
|
git checkout feature1
|
|
|
|
git stash
|
|
|
|
git rebase master
|
|
|
|
git stash apply
|
|
|
|
``` |