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
-
More than likely. Dealing with merge conflicts properly is part of everyday life when you use git.
-
GnoeJuan5798yI used to be so bad about this until I took the time to stop and learn about git. I personally enjoyed Udacity's tutorial on git.
-
hell169538yI do that with our intern, he always manage to fuck things up and by the 10th time I just:
Me: is everything pushed?
He: yes
Me: so delete the folder and clone again.
Just did that and gone to lunch today
😂 -
skonteam9828y@azous Intern = is there to learn and help, so maybe showing him how to resolve the conflicts would save you future headaches .
-
hell169538y@skonteam 10th time.
I do teach but somehow he manages to don't get anything and just lack the will to figure out the most basic things on his own, even after one year of using git. -
wmhilton3398yLocally, sure I've done that. Force push branches? Sure I've done that. Delete the repo from Github...?! Nope. Not that I recall.
Related Rants
Am I the only person that deletes their github repo and then uploads it again when you encounter a merge conflict?
undefined
git
github
merge conflict