@@ -77,17 +77,17 @@ project to which you’re trying to contribute but that you don’t maintain."_
77
77
78
78
== Keeping your Local Code in Sync
79
79
* As mentioned above, you should always work on topic branches (since 'main' is a moving target). However, you do want
80
- to always keep your own 'origin' main branch in synch with the 'upstream' main.
80
+ to always keep your own 'origin' main branch in sync with the 'upstream' main.
81
81
* Within your local working directory, you can sync up all remotes' branches with: `git fetch --all`
82
82
* While on your own local main branch: `git pull upstream main` (which is the equivalent of fetching upstream/main
83
83
and merging that into the branch you are in currently)
84
- * Now that you're in synch , switch to the topic branch where you plan to work, e.g.: `git checkout -b GH-123`
84
+ * Now that you're in sync , switch to the topic branch where you plan to work, e.g.: `git checkout -b GH-123`
85
85
* When you get to a stopping point: `git commit`
86
- * If changes have occurred on the upstream/main while you were working you can synch again:
86
+ * If changes have occurred on the upstream/main while you were working you can sync again:
87
87
- Switch back to main: `git checkout main`
88
88
- Then: `git pull upstream main`
89
89
- Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists)
90
- - Rebase the topic branch to minimize the distance between it and your recently synched main branch: `git rebase main`
90
+ - Rebase the topic branch to minimize the distance between it and your recently synced main branch: `git rebase main`
91
91
(Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]).
92
92
* **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history
93
93
(see **'The Perils of Rebasing'** in the article).
0 commit comments