When Git Resolves Changes It Shouldn't

added by DotNetKicks
6/25/2019 1:31:52 PM

2 Kicks, 229 Views

When you merge two branches, there may be conflicting changes between the branches. Git can often resolve these differences without intervention. For example, when each branch has changes to different files or lines of code. But sometimes each branch has changes that Git cannot resolve without help.