... | ... | @@ -25,6 +25,7 @@ git pull origin master |
|
|
git checkout work-branch
|
|
|
git merge master
|
|
|
```
|
|
|
* **RUN THE REGRESSION TESTS !!!**
|
|
|
* Branch master to host your work `git checkout -b work-branch-patch`. Choose a meaningful name.
|
|
|
* Merge and squash `work-branch` into `work-branch-patch`: `git merge --squash work-branch`. The proposed commit message aggregates all the commit messages of branch `work-branch`. **Edit this commit message** so that is is meaningful for other users (remove what is not necessary).
|
|
|
* Push `work-branch-patch` into `origin`:
|
... | ... | @@ -51,6 +52,7 @@ The usage is the same, except that: |
|
|
git checkout work-branch
|
|
|
git merge master
|
|
|
```
|
|
|
* **RUN THE REGRESSION TESTS !!!**
|
|
|
* Sync: `git merge --squash work-branch`
|
|
|
* Push on origin:
|
|
|
```
|
... | ... | |