| 116 |
|
specifically working with a developer on an issue |
| 117 |
|
already. |
| 118 |
|
</li> |
| 119 |
+ |
<li> |
| 120 |
+ |
Gratuitous merge commits should be avoided, particularly |
| 121 |
+ |
when merging development branches to <code>master</code>. |
| 122 |
+ |
They don't offer much in the way of useful information |
| 123 |
+ |
and make operations like bisect harder. In particular, |
| 124 |
+ |
if you pull changes to your local repository and end up |
| 125 |
+ |
with a merge commit you should use rebase to get rid of |
| 126 |
+ |
it before pushing. |
| 127 |
+ |
</li> |
| 128 |
|
</ol> |
| 129 |
|
</div> |
| 130 |
|
<!--#include virtual="/footer.inc" --> |
