4. Hg Init – a Mercurial tutorial by TortoiseHg - Merging 관련글: http://surpreem.com/archives/45

1. Hg Init – Mercurial tutorial by TortoiseHg Merging

2. Merging Rose’s recipes % cmd:hg pull 1. 2.

3. Merging Rose’s recipes % cmd:hg up

4. Merging Rose’s recipes

5. Merging Rose’s recipes % cmd:hg diff % cmd:hg com –m “better avocados”

6. Merging Rose’s recipes % cmd:hg push

7. Merging Joel’s recipes

8. Merging Joel’s recipes % cmd:hg diff % cmd:hg com –m “better chile”

9. Merging Joel’s recipes % cmd:hg push

10. Merging Joel’s recipes % cmd:hg pull / hg log % cmd:hg parent % cmd:hg heads % cmd:hg log –P .

11. Merging Joel’s recipes % cmd:hg merge rev8 기준으로 작업

12. Merging Joel’s recipes

13. Merging Joel’s recipes

14. Merging Joel’s recipes Beyond Compare 3 Pro rev8 merged rev9

15. Merging Joel’s recipes % cmd:hg commit –m merge

16. Merging Joel’s recipes % cmd:hg log

17. Merging Joel’s recipes % cmd:type guac Menifest

18. Merging Joel’s recipes % cmd:hg push

19. Merging Rose’s recipes % cmd:hg in / hg pull 1. 2.

20. Merging Rose’s recipes % cmd:hg up

21. Merging Joel’s recipes

22. Merging Joel’s recipes % cmd:hg diff % cmd:hg com –m “banana YUM”

23. Merging Joel’s recipes

24. Merging Rose’s recipes

25. Merging Rose’s recipes % cmd:hg diff % cmd:hg com –m “mmmmango”

26. Merging Rose’s recipes % cmd:hg pull % cmd:hg merge

27. Merging Rose’s recipes

28. Merging Rose’s recipes

29. Merging Rose’s recipes Beyond Compare 3 Pro Joel’s guac Rose’s guac Original Merged

30. Merging Rose’s recipes Beyond Compare 3 Pro Joel’s guac Rose’s guac Original Merged

31. Merging Rose’s recipes

32. Merging Rose’s recipes % cmd:hg com –m “merge” 1. % cmd:hg diff 2.

33. Merging Rose’s recipes % cmd:hg pull Rose’s Repository Central Repository