spacepaste

Paste details

reply | raw

  1.  
  2. #!/usr/bin/env bash
  5. YELLOW='\033[43;30m'
  6. NORMAL='\033[0m'
  9. status() {
  10. echo -e "$YELLOW$@$NORMAL"
  11. }
  14. cd /tmp
  16. status 'init git repo'
  17. git init tmp_repo
  18. cd tmp_repo
  20. status 'add commit to original repo'
  21. touch foo
  22. git add foo
  23. git commit -m add_foo_file
  24. cd ..
  26. status 'clone repo'
  27. git clone tmp_repo tmp_repo_clone
  28. cd tmp_repo_clone
  30. status 'checkout and make left branch'
  31. git checkout origin/master -b left
  32. echo 'left' > left_only_file
  33. git add left_only_file
  34. echo 'left' > conflict_file
  35. git add conflict_file
  36. git commit -m conflict_left
  38. status 'checkout and make right branch'
  39. git checkout origin/master -b right
  40. echo 'right' > right_only_file
  41. git add right_only_file
  42. echo 'right' > conflict_file
  43. git add conflict_file
  44. git commit -m conflict_right
  46. status 'merge left'
  47. git merge left
  48. echo 'resolved' > conflict_file
  49. git add conflict_file
  50. echo 'new' > commit_introduced_file
  51. git add commit_introduced_file
  53. status 'try and make diff'
  54. cp .git/index .git/preserved-index
  55. GIT_INDEX_FILE=.git/preserved-index git ls-files --unmerged
  56. GIT_INDEX_FILE=.git/preserved-index git diff-files --name-only
  58. status 'done'
  59.  
Powered by spacepaste. Paste removal.