Explain how Git manages branches and how you would resolve a merge conflict during a production release.
