Git - merge vs rebase [mikstura.it #4]

2,102 views
1,553 views

Published on

based on http://mislav.uniqpath.com/2013/02/merge-vs-rebase/

video - presentation in polish language, is here: https://vimeo.com/62857860

Published in: Technology

Git - merge vs rebase [mikstura.it #4]

  1. 1. Merge vs Rebase by cs3b, the LumberjackTuesday, April 2, 13
  2. 2. http://chuva-inc.com/sites/default/files/blog_posts/356merge-conflicts.jpgTuesday, April 2, 13
  3. 3. http://assets.diylol.com/hfs/9e8/173/858/resized/obama-git-meme-generator-git-rebase-no-conflicts-6c0bee.jpg?1345812920.jpgTuesday, April 2, 13
  4. 4. http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/Tuesday, April 2, 13
  5. 5. Git http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/Tuesday, April 2, 13
  6. 6. http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/Tuesday, April 2, 13
  7. 7. http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/Tuesday, April 2, 13
  8. 8. http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/Tuesday, April 2, 13
  9. 9. http://learningtoteachscience.files.wordpress.com/2011/12/31.gifTuesday, April 2, 13
  10. 10. git pull http://learningtoteachscience.files.wordpress.com/2011/12/31.gifTuesday, April 2, 13
  11. 11. git pull http://stevenharman.net/images/posts/y-u-no-rebase-preview.jpgTuesday, April 2, 13
  12. 12. git pull --rebase http://johnmdonahue.com/images/rebase-no-conflict.jpgTuesday, April 2, 13
  13. 13. git pull --rebaseTuesday, April 2, 13
  14. 14. git pull --rebase git config --global Tuesday, April 2, 13
  15. 15. git pull --rebase git config --global --bool pull.rebase trueTuesday, April 2, 13
  16. 16. git pull --rebase git config --global --bool pull.rebase trueTuesday, April 2, 13
  17. 17. http://sd.keepcalm-o-matic.co.uk/i/keep-calm-and-git-rebase.pngTuesday, April 2, 13
  18. 18. git local rebase http://sd.keepcalm-o-matic.co.uk/i/keep-calm-and-git-rebase.pngTuesday, April 2, 13
  19. 19. git rebase -i @{u} http://rypress.com/tutorials/git/media/5-5.pngTuesday, April 2, 13
  20. 20. why git local rebaseTuesday, April 2, 13
  21. 21. why git local rebase squashing related commitsTuesday, April 2, 13
  22. 22. why git local rebase squashing related commits rewording commit messagesTuesday, April 2, 13
  23. 23. why git local rebase squashing related commits rewording commit messages easier git pull --rebaseTuesday, April 2, 13
  24. 24. http://cdn.memegenerator.net/instances/400x/23215407.jpgTuesday, April 2, 13
  25. 25. http://rypress.com/tutorials/git/media/5-1.pngTuesday, April 2, 13
  26. 26. Merge instead of rebase when? http://rypress.com/tutorials/git/media/5-1.pngTuesday, April 2, 13
  27. 27. merge objectTuesday, April 2, 13
  28. 28. merge objectTuesday, April 2, 13
  29. 29. merge object git merge --no-ff featureTuesday, April 2, 13
  30. 30. merge object http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  31. 31. merge object where come from http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  32. 32. merge object where come from when were merge http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  33. 33. merge object where come from when were merge and by whom were merged e.g code review http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  34. 34. merge object where come from when were merge and by whom were merged e.g code review commits related are grouped together http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  35. 35. merge object http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  36. 36. merge object where from is irrelevant http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  37. 37. merge object where from is irrelevant when and who are already in commit timestamp http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  38. 38. merge object where from is irrelevant when and who are already in commit timestamp there is nothing to grouped together http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  39. 39. merge object git cherry-pick feature http://en.wikipedia.org/wiki/File:Yes_check.svgTuesday, April 2, 13
  40. 40. http://rypress.com/tutorials/git/media/5-1.png http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  41. 41. one more don’t try this at home http://rypress.com/tutorials/git/media/5-1.png http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.pngTuesday, April 2, 13
  42. 42. git push --force http://anongallery.org/8156/Tuesday, April 2, 13
  43. 43. http://cdn.memegenerator.net/instances/250x250/34108963.jpgTuesday, April 2, 13
  44. 44. http://cdn.memegenerator.net/instances/400x/24192455.jpgTuesday, April 2, 13

×