4 ----------------------------------------- |
4 ----------------------------------------- |
5 Good practice for (early) users of evolve |
5 Good practice for (early) users of evolve |
6 ----------------------------------------- |
6 ----------------------------------------- |
7 |
7 |
8 Avoid unstability |
8 Avoid unstability |
9 -------------------------------- |
9 ----------------- |
10 |
10 |
11 The less unstability you have the less you need to resolve. |
11 The less unstability you have the less you need to resolve. |
12 |
12 |
13 Evolve is not yet able to detect and solve every situation. And your mind is |
13 Evolve is not yet able to detect and solve every situation. And your mind is |
14 not ready neither. |
14 not ready neither. |
15 |
15 |
16 Branch as much as possible |
16 Branch as much as possible |
17 -------------------------------- |
17 -------------------------- |
18 |
18 |
19 This is not MQ; you are not constrained to linear history. |
19 This is not MQ; you are not constrained to linear history. |
20 |
20 |
21 Making a branch per independent branch will help you avoid unstability |
21 Making a branch per independent branch will help you avoid unstability |
22 and conflict. |
22 and conflict. |
23 |
23 |
24 Rewrite your changes only |
24 Rewrite your changes only |
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 pratice in any case). |
38 If you have children changesets from other people that you don't really care |
38 If you have children changesets from other people that you don't really care |
39 about, prefer not altering them to risking a conflict by stabilizing them. |
39 about, prefer not altering them to risking a conflict by stabilizing them. |
40 |
40 |
41 |
41 |
42 Do not get too confident |
42 Do not get too confident |
43 --------------------------- |
43 ------------------------ |
44 |
44 |
45 This is an experimental extension and a complex concept. This is beautiful, |
45 This is an experimental extension and a complex concept. This is beautiful, |
46 powerful and robust on paper, but the tool and your mind may not be prepared for |
46 powerful and robust on paper, but the tool and your mind may not be prepared for |
47 all situations yet. |
47 all situations yet. |