Skip to content

Commit f4a7509

Browse files
committed
Update CONTRIBUTING.md
1 parent 24707be commit f4a7509

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

CONTRIBUTING.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ meets all requirements outlined in this document.**
4343
2. Make a [topic branch](https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches)
4444
and start hacking.
4545
3. If your branch becomes several commits behind master, be sure to rebase
46-
to avoid a merge conflict.
46+
your change *on top* of master to avoid a merge conflict.
4747
3. Submit a pull-request based off your topic branch, following the patch
4848
rules below.
4949
4. If your patch is non-trivial and you haven't submitted a [signed CLA](http://logback.qos.ch/cla.txt),
@@ -92,7 +92,7 @@ meets all requirements outlined in this document.**
9292
where necessary. Examples where this would be required:
9393
* adding/removing a configuration flag to `SyslogAppender`
9494
* adding a new appender to `logback-classic`
95-
95+
9696
# General style notes
9797

9898
Please note that most of the formatting rules are provided in
@@ -179,6 +179,12 @@ try {
179179
*/
180180
```
181181

182+
The following command will automatically apply/update the license-header comments for *all* Java/Groovy files. Since this command touches more than only your modified files, be sure to exclude unrelated files from your PR.
183+
184+
```
185+
mvn -P license license:format
186+
```
187+
182188
**S5.** Add javadoc for public functions (we won't fault you for skipping private
183189
functions unless comments are warranted).
184190

0 commit comments

Comments
 (0)