Explain how Git handles conflicts during merges or rebases.?
When two branches modify the same part of a file, Git can’t automatically decide which
version to keep — this creates a conflict.
Git will:
When two branches modify the same part of a file, Git can’t automatically decide which
version to keep — this creates a conflict.
Git will: