How do I resolve Git merge conflicts?

I'm trying to merge branches in Git, but I'm getting merge conflicts. What should I do?

Merge conflicts occur when changes in different branches overlap. You can resolve them by manually editing the conflicting files.

How do I know which files have conflicts?

After a merge attempt, Git will list the files with conflicts in the terminal. You can also use git status to see them.

What if I want to abort the merge?

You can abort the merge by running git merge --abort. This will revert your branch to the state before the merge.

Is there a way to automatically resolve simple conflicts?

Yes, you can use git merge -X ours or git merge -X theirs to automatically resolve conflicts in favor of one branch.