What methods do you usually use to resolve conflicts when merging changes in Git?

When conflicts occur during a Git merge, I usually use the following methods:

• Viewing conflicting files and analyzing changes with git diff.
• Manually editing conflict sections in files where Git marks conflict blocks.
• Using visual merge tools, such as GitKraken, SourceTree, or built-in IDE tools (IntelliJ IDEA, VSCode).
• After resolving conflicts, I run git add on the marked files and complete the merge with git commit.

If the conflict is complex, I discuss with the team to understand which changes are more important to keep. It's also important to test the code after merging to ensure nothing is broken.