Skip to content

Commit 02ce97e

Browse files
authored
update rebase vs merge for forked repositories
1 parent b51a6a5 commit 02ce97e

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,24 @@ now, when you add the files it ignores node_modules directory in your project.
180180
```
181181
git fetch upstream
182182
```
183-
Any new changes and branches from the original forked repository should now be fetched to your local repository. You can now choose to either rebase your local branch, or merge the changes from the forked repository into your branch.
184-
185-
If you are unsure about which option to pick, you can read more about [the differences between rebasing and merging in this article](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).
186-
183+
Any new changes and branches from the original forked repository should now be fetched to your local repository.
184+
187185
4. Rebase your local branch, or merge the changes
186+
187+
You can now choose to either rebase your local branch, or merge the changes from the forked repository into your branch. If you are unsure about which option to pick, you can read more about [the differences between rebasing and merging in this article](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).
188+
188189

189-
**Rebase**
190+
Use the following if you want to rebase your branch:
190191
```
191192
git rebase upstream/master
192193
```
193194

194-
**Merge**
195+
Or use the merge command if you want to merge instead:
195196
```
196197
git merge upstream/master
197198
```
199+
200+
Replace "master" with the name of the branch on the forked repository that you want to rebase or merge with.
198201

199202
**[⬆ Back to Index](#index-books)**
200203

0 commit comments

Comments
 (0)