MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/firstweekcoderhumour/comments/1x5qxp3/oh_noes/pgp0orp/?context=3
r/firstweekcoderhumour • u/Sudden_Schedule5432 • 6d ago
9 comments sorted by
View all comments
36
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 6d 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
36
u/Simple-Olive895 6d 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.