equal
deleted
inserted
replaced
824 |
824 |
825 |
825 |
826 Handling Divergent amend |
826 Handling Divergent amend |
827 ---------------------------------------------- |
827 ---------------------------------------------- |
828 |
828 |
829 We can detect that multiple diverging/conflicting amendments have been made. |
829 We can detect that multiple diverging amendments have been made. |
830 The `evolve` command can solve this situation. But all corner case are not |
830 The `evolve` command can solve this situation. But all corner case are not |
831 handled now. |
831 handled now. |
832 |
832 |
833 This section needs to be written. |
833 This section needs to be written. |