6
kai18
3y

3 months old branch! And I have to resume work on it! git pull origin master ….. fuck me!!

Comments
  • 0
    Would it help you started a new branch off master and cherry pick?
  • 0
    Git merge dev

    Conflicts, conflicts everywhere, wait why are there a whole bunch of files renamed, fuck it

    Git merge --abort

    Tomorrow's problem.
  • 0
    In my case, there is no one but me to blame.
Add Comment