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

Ranter

Comments

0

asgs

11277

3y

Would it help you started a new branch off master and cherry pick?
0

C0D4

66881

3y

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

darkwind

1492

3y

In my case, there is no one but me to blame.

devRant © 2021 Hexical Labs LLC
Privacy Policy | Terms of Service