equal
deleted
inserted
replaced
25 ------------------------- |
25 ------------------------- |
26 |
26 |
27 There is no descent conflict detection and handling right now. |
27 There is no descent conflict detection and handling right now. |
28 Rewriting other people's changesets guarantees that you will get |
28 Rewriting other people's changesets guarantees that you will get |
29 conflicts. Communicate with your fellow developers before trying to |
29 conflicts. Communicate with your fellow developers before trying to |
30 touch other people's work (which is a good pratice in any case). |
30 touch other people's work (which is a good practice in any case). |
31 |
31 |
32 Using multiple branches will help you to achieve this goal. |
32 Using multiple branches will help you to achieve this goal. |
33 |
33 |
34 Prefer pushing unstability to touching other people changesets |
34 Prefer pushing unstability to touching other people changesets |
35 -------------------------------------------------------------- |
35 -------------------------------------------------------------- |