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
-
jote66yHow does anyone even come to that point? Learn git (and how to solve merge conflicts). That helps.
-
Snob20926yI once did this without saving the QT user file (it was .gitignored) ... That resulted in me spending a lot of time rebuilding all build-, debug- and run configurations by hand -.-
-
anroven3656yI'm always amazed how many people won't take 15 minutes to learn how to use git properly. It's not that hard, and will improve your developer life a lot.
-
@Mitiko it doesn't matter whether you
* commit->merge->conflict or
* stash->pull->pop->conflict.
With the merge you can at least use "-X theirs" ; which might get you around the conflicts.
Git Pull Failed, Merge Conflict.
Me:
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it
Me:
Delete local project folder and pull the project down again.
rant
i promise i know how to use git
git meme