| ... | @@ -28,7 +28,7 @@ To update a remote feature branch: |
... | @@ -28,7 +28,7 @@ To update a remote feature branch: |
|
|
```sh
|
|
```sh
|
|
|
# Cleaner method. Try this first.
|
|
# Cleaner method. Try this first.
|
|
|
git rebase master
|
|
git rebase master
|
|
|
git push -f origin my_branch
|
|
git push --force-with-lease origin my_branch
|
|
|
|
|
|
|
|
# Simpler method when dealing with a complex merge.
|
|
# Simpler method when dealing with a complex merge.
|
|
|
git merge master
|
|
git merge master
|
| ... | | ... | |