troubleshooting Question

Is this statement correct?

Avatar of Bruce Gust
Bruce GustFlag for United States of America asked on
Git
4 Comments2 Solutions60 ViewsLast Modified:
Is this statement correct?

The difference between a "diff" and a "conflict" in Git is that a "diff," meaning "difference," is merge-able. There's been a singular change to a line of code and it's just a matter of updating that file.  A "conflict" is a deal breaker. You've got more than one change being made on the same line of code and in that instance, you have to manually inspect that line and choose what code you want to use going forward.
Join the community to see this answer!
Join our exclusive community to see this answer & millions of others.
Unlock 2 Answers and 4 Comments.
Join the Community
Learn from the best

Network and collaborate with thousands of CTOs, CISOs, and IT Pros rooting for you and your success.

Andrew Hancock - VMware vExpert
See if this solution works for you by signing up for a 7 day free trial.
Unlock 2 Answers and 4 Comments.
Try for 7 days

”The time we save is the biggest benefit of E-E to our team. What could take multiple guys 2 hours or more each to find is accessed in around 15 minutes on Experts Exchange.

-Mike Kapnisakis, Warner Bros