GIT - how to merge two branches?

Question

git

Actually, there is a main develop branch and two branches for features.
In both branches, one file was changed (one method was added in one branch, another - in the other).
How to merge feature 2 in develop and resolve the conflict?

Answer 1

We just do this:

git checkout develop
git merge feature2

after that, if there is a conflict, then you need to manually resolve it and make a commit. This is standard practice in git.