Testing Git Merge and Rebase

  • test 1 2 3 4 5
  • test a b c d e f g h
  • test x y z
  • testing abcdefg
  • testing 123456
  • lalalalalala
  • should have rebase conflict

testing rebase conflict again