Happens when working on a team project when two/more developers have edited the same file.
Therefore, face the conflict courageously.
Assumption: current_branch
(local branch) conflicts with a base branch called base-branch
git pull origin --rebase develop
. If merge conflicts persist:- Fix merge conflicts by accepting either
current changes
,incoming changes
orAccept both changes