Georg Brandl avatar Georg Brandl committed 5d77591

Some more advice about merges.

Comments (0)

Files changed (1)

 * Do **not** do cosmetic changes to unrelated code in the same commit as some
   feature/bugfix.
 
+It is of course okay to pile up several commits to one branch and merge them
+into another in one merge commit.
+
 
 Patch Checklist
 ---------------
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.