4. hg init – a mercurial tutorial by tortoise hg merging

3,027 views

Published on

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

Published in: Technology
0 Comments
2 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
3,027
On SlideShare
0
From Embeds
0
Number of Embeds
391
Actions
Shares
0
Downloads
0
Comments
0
Likes
2
Embeds 0
No embeds

No notes for slide

4. hg init – a mercurial tutorial by tortoise hg merging

  1. 1. Hg Init – Mercurial tutorial<br />by TortoiseHg<br />Merging<br />
  2. 2. Merging<br />Rose’s recipes<br />% cmd:hg pull<br />1.<br />2.<br />
  3. 3. Merging<br />Rose’s recipes<br />% cmd:hg up<br />
  4. 4. Merging<br />Rose’s recipes<br />
  5. 5. Merging<br />Rose’s recipes<br />% cmd:hg diff<br />% cmd:hg com –m “better avocados”<br />
  6. 6. Merging<br />Rose’s recipes<br />% cmd:hg push<br />
  7. 7. Merging<br />Joel’s recipes<br />
  8. 8. Merging<br />Joel’s recipes<br />% cmd:hg diff<br />% cmd:hg com –m “better chile”<br />
  9. 9. Merging<br />Joel’s recipes<br />% cmd:hg push<br />
  10. 10. Merging<br />Joel’s recipes<br />% cmd:hg pull / hg log<br />% cmd:hg parent<br />% cmd:hg heads<br />% cmd:hg log –P .<br />
  11. 11. Merging<br />Joel’s recipes<br />% cmd:hg merge<br />rev8 기준으로 작업<br />
  12. 12. Merging<br />Joel’s recipes<br />
  13. 13. Merging<br />Joel’s recipes<br />
  14. 14. Merging<br />Joel’s recipes<br />Beyond Compare 3 Pro<br />rev8<br />merged<br />rev9<br />
  15. 15. Merging<br />Joel’s recipes<br />% cmd:hg commit –m merge<br />
  16. 16. Merging<br />Joel’s recipes<br />% cmd:hg log<br />
  17. 17. Merging<br />Joel’s recipes<br />% cmd:type guac<br />Menifest<br />
  18. 18. Merging<br />Joel’s recipes<br />% cmd:hg push<br />
  19. 19. Merging<br />Rose’s recipes<br />% cmd:hg in / hg pull<br />1.<br />2.<br />
  20. 20. Merging<br />Rose’s recipes<br />% cmd:hg up<br />
  21. 21. Merging<br />Joel’s recipes<br />
  22. 22. Merging<br />Joel’s recipes<br />% cmd:hg diff<br />% cmd:hg com –m “banana YUM”<br />
  23. 23. Merging<br />Joel’s recipes<br />
  24. 24. Merging<br />Rose’s recipes<br />
  25. 25. Merging<br />Rose’s recipes<br />% cmd:hg diff<br />% cmd:hg com –m “mmmmango”<br />
  26. 26. Merging<br />Rose’s recipes<br />% cmd:hg pull<br />% cmd:hg merge<br />
  27. 27. Merging<br />Rose’s recipes<br />
  28. 28. Merging<br />Rose’s recipes<br />
  29. 29. Merging<br />Rose’s recipes<br />Beyond Compare 3 Pro<br />Joel’s guac<br />Rose’s guac<br />Original<br />Merged<br />
  30. 30. Merging<br />Rose’s recipes<br />Beyond Compare 3 Pro<br />Joel’s guac<br />Rose’s guac<br />Original<br />Merged<br />
  31. 31. Merging<br />Rose’s recipes<br />
  32. 32. Merging<br />Rose’s recipes<br />% cmd:hg com –m “merge”<br />1.<br />% cmd:hg diff<br />2.<br />
  33. 33. Merging<br />Rose’s recipes<br />% cmd:hg pull<br />Rose’s Repository<br />Central Repository<br />

×