Skip to content

Commit 934bb39

Browse files
committed
improve CONTRIB guide for to rebase
1 parent a706824 commit 934bb39

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

CONTRIBUTING.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,15 @@ With this method, the sources are also implicitly installed in
189189
## Sync your Branch with the Original Repository
190190

191191
Sometimes the main repository made changes that you want to have in your development branch of your fork.
192-
To do this you can use the GitHub web interface of your forked repository.
193-
Just click the "Sync fork" button and then "Update branch".
192+
To do this go to the GitHub web interface of your forked repository.
193+
Make sure you are in the main branch.
194+
Then just click the "Sync fork" button and then "Update branch".
194195

195196
Then run these GIT commands:
196197

197198
```bash
198-
git checkout main
199-
git pull
200-
git checkout <your_dev_branch>
201-
git rebase main
199+
git fetch origin main
200+
git rebase origin/main
201+
# resolve possible conflicts
202+
git push -f
202203
```

0 commit comments

Comments
 (0)