You are viewing a single thread.
View all comments 71 points
if u ever get a tricky merge conflict, just git push --force
. this automatically works out the right code to keep (your own)
15 points
8 points
if u ever get a tricky merge conflict, just git push --force
. this automatically works out the right code to keep (your own)
Post funny things about programming here! (Or just rant about your favourite programming language.)
5.3K
Monthly active users
1.5K
Posts
33K
Comments