How to resolve issue while attempting to pull

[Tony Ho _Vinova_]

Can anybody help me to check this issue when try to pull. Thank you so much!

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks fetch --no-tags origin

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks pull origin feature/kwa-417
From https://gitlab.com/myproject/backend
* branch feature/k-417 -> FETCH_HEAD

fatal: Not possible to fast-forward, aborting.
Completed with errors, see above.

[Erez Maadani]

Hey @Tony Ho _Vinova_ 

git pull is actually git fetch and git merge.

As you can see above, git fetch is working fine so the failing step is the merge from your local copy of your remote branch into your local branch.

The error you get is that it's not possible to do fast-forward, which probably means that you have local changes/commits which were not pushed to the remote branch. The command `git status` will help you to get more info.

If you need to keep your local changes, the most common option to resolve this kind of issues, is to use explicit merge strategy, and not the only-fast-forward strategy. Have a look here: https://www.atlassian.com/git/tutorials/using-branches/merge-strategy for more info.

Another option would be to:

• Move your local changes/commit to a different branch.
• Reset your local branch back to the last common commit with your remote branch
• Merge the changes from your remote branch
• Re-apply the changes from the new branch you created on your local branch.