Submitted by twovests in programming (edited )
the tale of "Four People Are Ready To Merge Their Code But Will Still Be Changing It"
EDIT: nevermind i know what to do
EDIT: i'm not sure what i did but i'm sure i fucked up everything
EDIT: thank god for git reset --hard
Trust in your heart and the diffs shall become as one
this book/website has saved my bacon more often than i'd like to admit. good luck brave programmer.
I appreciate it! This site is actually already one of the many git related tabs I have open :D
My controversial opinion: what Git does is valuable enough, but the way everything works is super convoluted.
i agree; git is good but for some reason people act like it's the only DVCS out there; I've always found mercurial to be easier to use and less convoluted and easier to learn.
Facebook uses Mercurial because Git was too slow.
huh that's interesting. i have used hg in the past and thought it was very easy to understand compared to git but moved to git because mercurial was too slow. i guess its speed has improved over the years, i'll have to give it another shot!
Facebook wrote a blogpost on the topic, it's four years old by now though.
mercurial is also a heck of a lot easier to write plugins and extensions for so it's much easier to hook it in to other, larger scale source control systems.
voxpoplar wrote
oh no