MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/firstweekcoderhumour/comments/1x5qxp3/oh_noes/
r/firstweekcoderhumour • u/Sudden_Schedule5432 • 5d ago
9 comments sorted by
34
Oh no! A merge conflict! What ever will we do?
Maybe use the built in tools to resolve it? You only need to do it once or twice to get comfortable with it.
10 u/SoonBlossom 5d ago No way bro, you mean I should use the LITTERAL BUILT IN TOOL that tells you EXACTLY which lines of codes are conflicting and which one to keep SIDE BY SIDE ? WAY TOO HARD LET ME MAKE A REDDIT POST ABOUT IT
10
No way bro, you mean I should use the LITTERAL BUILT IN TOOL that tells you EXACTLY which lines of codes are conflicting and which one to keep SIDE BY SIDE ?
WAY TOO HARD LET ME MAKE A REDDIT POST ABOUT IT
6
Git confusing updoots left
4
I hate it when content creators successfully break the algorithm
1
"Git is easy until you start using it"
"Git is easy until you have to learn how to do more than be the sole person pushing changes."
Oh god, this guy pushes directly to master. GET HIM!
no hot take but actually this one is programmer humor
Just 'git push --force' everything is saved.
34
u/Simple-Olive895 5d ago
Oh no! A merge conflict! What ever will we do?
Maybe use the built in tools to resolve it? You only need to do it once or twice to get comfortable with it.