Skip to content

Commit 26d095e

Browse files
authored
[CLEANUP] Autoformat CONTRIBUTING.md (#1353)
This will allow autoformatting when we do changes without introducing unrelated formatting changes.
1 parent 7828367 commit 26d095e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

CONTRIBUTING.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ composer require --dev slevomat/coding-standard:^4.0
6262
```
6363

6464
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
6666
dependencies and should be omitted if specifically testing against an earlier
6767
version of PHP, however you will not be able to run the static code analysis.
6868

@@ -134,31 +134,31 @@ The procedure below is tried and tested, and will help you avoid frustration.
134134
To rebase a feature branch to the latest `main`:
135135

136136
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):
139139
```sh
140140
git checkout main
141141
git pull
142142
```
143143
1. Switch to the (feature) branch to be rebased and make sure your copy is up to
144-
date:
144+
date:
145145
```sh
146146
git checkout feature/something-cool
147147
git pull
148148
```
149149
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.
151151
1. Begin the rebasing process
152152
```sh
153153
git rebase main
154154
```
155155
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.
162162

163163
If there were no conflicts, skip this and the next step.
164164
1. Mark the conflicting files as resolved and continue the rebase
@@ -177,14 +177,14 @@ To rebase a feature branch to the latest `main`:
177177
```sh
178178
git push --force
179179
```
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
181181
hint suggesting a `git pull` is required:
182182
```
183183
hint: Updates were rejected because the tip of your current branch is behind
184184
hint: its remote counterpart. Integrate the remote changes (e.g.
185185
hint: 'git pull ...') before pushing again.
186186
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
187187
```
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
189189
set of all commits on the feature branch being duplicated, and the "patching
190190
base" not being moved at all.

0 commit comments

Comments
 (0)