#gitconflicts - Twitter Hashtag

over 3 years ago

Solving #GitConflicts can be overwhelming but the best way to start is to identify the source of the conflict. Once you know where the conflict is coming from, you can begin to resolve it. #Git #VersionControl #Programming

therahilshaikh's tweet photo. Solving #GitConflicts can be overwhelming but the best way to start is to identify the source of the conflict. Once you know where the conflict is coming from, you can begin to resolve it. #Git #VersionControl #Programming https://t.co/niGZFtcfHF

0

3

0

151

Reviewpad (part of Snyk) @reviewpad

almost 5 years ago

Have you ever aced the code review process with all checks passing and when you go for that merge button you find out that it is blocked because of git conflicts? 😤 Wouldn’t it be nice if you could avoid this situation? #devdiscuss https://t.co/8u1h1la6wP #GitConflicts

0

3

1

0

Patrick Koppenburg 🐧 @PKoppenburg

over 7 years ago

😱 Such things would never make it into the production software of @cern experiments. Because we check! Apparently @postschweiz thinks this is OK for an #Evoting system. #gitConflicts

dbrgn @dbrgn

over 7 years ago

Funniest finding in the @postschweiz #evoting sourcecode so far: There are about a dozen files with unresolved or partially resolved git merge conflicts 😆 How do such simple things pass code review? (Yes, it's not security relevant. But it indicates sloppy processes.)