Ranter
Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Pipeless API

From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
Learn More
Comments
-
Sorry I can't help you with this. This is a hard one. I need calculator and ruler to fix this conflict.
-
I have been told off in the past for removing a seemingly arbitrary line break in a git merge where neither branch was mine.
Related Rants
Unresolvable merge conflicts
joke/meme
resolve
merge
conflict
git