You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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
* branch feature/k-417 -> FETCH_HEAD
fatal: Not possible to fast-forward, aborting.
Completed with errors, see above.
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:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.