diff options
| -rw-r--r-- | HACKING | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -178,7 +178,7 @@ over-arching change, you should use a dedicated topic branch, and only merge that back once it is reasonably stable. -* The 'next' branch should be kept regularly merged into the 'master' +* The 'master' branch should be kept regularly merged into the 'next' branch. It is advisable to merge only after a set of related commits have been applied, to avoid introducing too much noise in the history. |