You can resolve them directly in the terminal using Git commands, use a text editor like VS Code, or rely on GUI tools such as GitHub Desktop, Sourcetree, or GitKraken.