|
241
|
1 |
----------------------------------------- |
|
|
2 |
Good pratice for (early) user of evolve |
|
|
3 |
----------------------------------------- |
|
|
4 |
|
|
|
5 |
Avoid instability |
|
|
6 |
-------------------------------- |
|
|
7 |
|
|
|
8 |
The less instability you have the less you need to resolve. |
|
|
9 |
|
|
|
10 |
Evolve is not yet able to detect and solve every situation. And your mind is |
|
|
11 |
not ready neither. |
|
|
12 |
|
|
|
13 |
Branch as much as possible |
|
|
14 |
-------------------------------- |
|
|
15 |
|
|
|
16 |
This is not MQ you are not constrainted to linear history. |
|
|
17 |
|
|
|
18 |
Making a branch per independent branch will help you avoiding instability and conflict. |
|
|
19 |
|
|
|
20 |
Rewrite you change only |
|
|
21 |
------------------------------------------------ |
|
|
22 |
|
|
|
23 |
There is no descent conflict detection and handling right now. rewriting other |
|
|
24 |
people changeset garantee that you will get conflict. Communicate with you |
|
|
25 |
fellow developer before trying to touch other people part. (which is a good |
|
|
26 |
pratice in any case) |
|
|
27 |
|
|
|
28 |
Using multiple branch will help you to achieve this goal. |
|
|
29 |
|
|
|
30 |
Prefer pushing unstability than touching other people changeset |
|
|
31 |
------------------------------------------------------------------ |
|
|
32 |
|
|
|
33 |
|
|
|
34 |
If you have children changeset from other people that you don't really care |
|
|
35 |
about, prefer not altering them that risking a conflict by stabilizing them. |
|
|
36 |
|
|
|
37 |
|
|
|
38 |
Do not get too confident |
|
|
39 |
--------------------------- |
|
|
40 |
|
|
|
41 |
This is an experimental extension and a complexe concept. This is beautiful, |
|
|
42 |
powerful and robust on paper. But the tool and your mind may not be prepared to |
|
|
43 |
all situation yet. |