equal
deleted
inserted
replaced
820 | |
820 | |
821 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
821 o 7e82d3f3c2cb (public): Monthy Python Shopping list |
822 |
822 |
823 |
823 |
824 |
824 |
825 Handling Conflicting amend |
825 Handling Divergent amend |
826 ---------------------------------------------- |
826 ---------------------------------------------- |
827 |
827 |
828 We can detect that multiple diverging/conflicting amendments have been made. There |
828 We can detect that multiple diverging/conflicting amendments have been made. |
829 will be a "evol-merge" command to merge conflicting amendments. |
829 The `evolve` command can solve this situation. But all corner case are not |
|
830 handled now. |
830 |
831 |
831 This section needs to be written. |
832 This section needs to be written. |