You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
ans:Conflicts generally arise when two people have changed the same lines in a file, or if one developer deleted a file while another developer was modifying it.
In these cases, Git cannot automatically determine what is correct.
->when Git is unable to automatically resolve differences in code between two commits.
->Git can merge the changes automatically only if the commits are on different lines or branches.