@@ -62,7 +62,7 @@ composer require --dev slevomat/coding-standard:^4.0
62
62
```
63
63
64
64
Note that the development dependencies (in particular, for PHP_CodeSniffer)
65
- require PHP 7.0 or later. The second command installs the PHP_CodeSniffer
65
+ require PHP 7.0 or later. The second command installs the PHP_CodeSniffer
66
66
dependencies and should be omitted if specifically testing against an earlier
67
67
version of PHP, however you will not be able to run the static code analysis.
68
68
@@ -134,31 +134,31 @@ The procedure below is tried and tested, and will help you avoid frustration.
134
134
To rebase a feature branch to the latest ` main ` :
135
135
136
136
1 . Make sure that your local copy of the repository has the most up-to-date
137
- revisions of ` main ` (this is important, otherwise you may end up rebasing to
138
- an older base point):
137
+ revisions of ` main ` (this is important, otherwise you may end up rebasing to
138
+ an older base point):
139
139
``` sh
140
140
git checkout main
141
141
git pull
142
142
```
143
143
1 . Switch to the (feature) branch to be rebased and make sure your copy is up to
144
- date:
144
+ date:
145
145
``` sh
146
146
git checkout feature/something-cool
147
147
git pull
148
148
```
149
149
1 . Consider taking a copy of the folder tree at this stage; this may help when
150
- resolving conflicts in the next step.
150
+ resolving conflicts in the next step.
151
151
1 . Begin the rebasing process
152
152
``` sh
153
153
git rebase main
154
154
```
155
155
1 . Resolve the conflicts in the reported files. (This will typically require
156
- reversing the order of the new entries in ` CHANGELOG.md ` .) You may use a
157
- folder ` diff ` against the copy taken at step 3 to assist, but bear in mind
158
- that at this stage ` git ` is partway through rebasing, so some files will have
159
- been merged and include the latest changes from ` main ` , whilst others might
160
- not. In any case, you should ignore changes to files not reported as having
161
- conflicts.
156
+ reversing the order of the new entries in ` CHANGELOG.md ` .) You may use a
157
+ folder ` diff ` against the copy taken at step 3 to assist, but bear in mind
158
+ that at this stage ` git ` is partway through rebasing, so some files will have
159
+ been merged and include the latest changes from ` main ` , whilst others might
160
+ not. In any case, you should ignore changes to files not reported as having
161
+ conflicts.
162
162
163
163
If there were no conflicts, skip this and the next step.
164
164
1 . Mark the conflicting files as resolved and continue the rebase
@@ -177,14 +177,14 @@ To rebase a feature branch to the latest `main`:
177
177
``` sh
178
178
git push --force
179
179
```
180
- The ` --force ` option is important. Without it, you'll get an error with a
180
+ The ` --force ` option is important. Without it, you'll get an error with a
181
181
hint suggesting a ` git pull ` is required:
182
182
```
183
183
hint: Updates were rejected because the tip of your current branch is behind
184
184
hint: its remote counterpart. Integrate the remote changes (e.g.
185
185
hint: 'git pull ...') before pushing again.
186
186
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
187
187
```
188
- *** DO NOT*** follow the hint and execute ` git pull ` . This will result in the
188
+ *** DO NOT*** follow the hint and execute ` git pull ` . This will result in the
189
189
set of all commits on the feature branch being duplicated, and the "patching
190
190
base" not being moved at all.
0 commit comments