Page History

*incoming>
local \/*

edit_f

add_f

add_d

rm_f

rm_d

mv_f

mv_d^f

edit_f

13. resolve: ignore
14. resolve: accept

15. resolve: text merge
28. with parent moved – resolve: text merge
29. with parent moved back – resolve: text merge
30. with parent moved twice – resolve: text merge

add_f

31: resolve: text merge

add_d

34. resolve: ignore
35. resolve: merge
36. with obstructions – resolve: merge

rm_f

rm_d

mv_f

32: resolve: move dir merge

mv_d^f