git冲突

  1. <<<<<<< HEAD
  2. xxx mine content
  3. =======
  4. xxx other content
  5. >>>>>>> origin/branchXX