Today is merge day... Today is conflic fix day XD

  • 1
    Poor you...
  • 0
    I am that person who develops for days without merge requesting and send a merge request containing 130+ changes in 19 commit, 1k+ line insertation and deletion

    But hey at least i fix the conflict myself before requesting, dont hit me :(
  • 2
    @illegaldisease if you merge master to your branch before merge request . Thx !
  • 0
    @jak645 Yup, i will never send a merge request that is behind master branch in commits
Add Comment