The dude who told me to skip learning Git basics cost me a whole weekend

Some guy on Reddit said 'just use GitHub Desktop, you don't need the command line' and I believed him. Ended up spending 6 hours trying to fix a merge conflict on Saturday because I had no clue what I was doing. Has anyone else been burned by taking advice from strangers online like that?

2 comments

2 Comments

caleb_ross1221d ago

Did you at least learn your lesson about merge conflicts after all that?

daniel_walker21d ago

Funny you mention that @caleb_ross12, because it reminds me of the time I spent a whole weekend untangling a merge conflict in a file that just had a bunch of database config stuff. Turned out my teammate had renamed a column in the same branch I was adding a new table. We kept overwriting each other's changes like we were playing a weird game of tag. I finally learned to pull more often and actually read the conflict markers before hitting "accept all incoming." Now I just use a branching strategy where we yell at each other before touching the same file.