Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-12-18 00:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #548 from erming/jd-mergeshedding

Browse source 
State that we prefer rebasing over merging PRs
This commit is contained in:
Jérémie Astori 2015-12-13 21:19:12 -05:00
commit 1943b0aed4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -32,6 +32,10 @@ Also, make sure that your PRs do not contain unnecessary commits. If you think
some of your commits should be merged into a single one, feel free to [squash some of your commits should be merged into a single one, feel free to [squash
them](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). them](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
Please [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) outdated
PRs on master to help with the reviews (rebasing is preferred over merging to
keep a clean history in a branch/PR).
Additionally, give extra care to your commit messages, as they will help us Additionally, give extra care to your commit messages, as they will help us
review your PRs as well as help other contributors in the future, when exploring review your PRs as well as help other contributors in the future, when exploring
the history. The general rules are to [use the imperative present the history. The general rules are to [use the imperative present