Note Resolving Merge Conflicts on Git

When the master branch is ahead of the feature branch, we need to resolve some conflicts when we merge the feature branch to the master branch.

git pull origin X

X is your main/master branch, ie. `development` or master

git pull origin development