GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-05-07 20:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document that rebasing feature branches is preferred

Browse Source 
over merging master. This is already enforced in the Dangerfile,
as of #1775 but we should probably document it.
This commit is contained in:
JP Simard
2017-08-21 13:25:47 -07:00
parent 0e1a636809
commit 96fd2191f1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+2 -1
View File
@@ -1,7 +1,8 @@
## Pull Requests
All changes, no matter how trivial, must be done via pull request. Commits
should never be made directly on the `master` branch.
should never be made directly on the `master` branch. Prefer rebasing over
merging `master` into your PR branch to update it and resolve conflicts.
_If you have commit access to SwiftLint and believe your change to be trivial
and not worth waiting for review, you may open a pull request and merge