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

Comments

voxpoplar wrote on March 20, 2018 at 7:35 PM

#3,129

oh no

hollyhoppet wrote on March 20, 2018 at 8:31 PM

#3,130

Trust in your heart and the diffs shall become as one

musou wrote on March 20, 2018 at 10:46 PM

#3,132

this book/website has saved my bacon more often than i'd like to admit. good luck brave programmer.

https://git-scm.com/book/en/v2

twovests OP wrote on March 20, 2018 at 11:18 PM

#3,133

Replying to musou (#3,132)

I appreciate it! This site is actually already one of the many git related tabs I have open :D

Moonside wrote on March 21, 2018 at 3:36 AM

#3,144

My controversial opinion: what Git does is valuable enough, but the way everything works is super convoluted.

flabberghaster wrote on March 21, 2018 at 4:26 AM

#3,145

Replying to Moonside (#3,144)

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.

Moonside wrote on March 21, 2018 at 7:19 AM

#3,149

Replying to flabberghaster (#3,145)

Facebook uses Mercurial because Git was too slow.

musou wrote on March 21, 2018 at 7:38 PM

#3,158

Replying to Moonside (#3,149)

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!

Moonside wrote on March 22, 2018 at 3:24 AM

#3,168

Replying to musou (#3,158)

Facebook wrote a blogpost on the topic, it's four years old by now though.

flabberghaster wrote on March 22, 2018 at 3:52 AM

#3,169

Replying to Moonside (#3,149)

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.