Breaking News: Grepper is joining You.com. Read the official announcement!

fast-forward, aborting

Add Answer

e-mallz contact answered on September 9, 2022 Popularity 6/10 Helpfulness 5/10

answer fast-forward, aborting

related Not possible to fast-forward, aborting.

related Not possible to fast-forward, aborting

fast-forward, aborting

Comment

This is because you have enabled the fast-forward only option. The thing here is your pull from the branch will create a merge commit in your local git and the fast-forward only option doesn't allow creating a merge commit at the time of pull.

In the case of a big team, You will end up rebasing and resolving conflicts lots of the time and for each and every commit coming from the pull.

I suggest you remove ff = only line from git local config file.

$ cd to-my-project-root-dir

$ nano .git/config

[pull]         ff = only // remove this line         rebase = false

Popularity 6/10 Helpfulness 5/10 Language shell

Source: www.thecodeteacher.com

Tags: shell

Link to this answer
Share Copy Link

Contributed on Sep 09 2022

e-mallz contact

0 Answers Avg Quality 2/10

Closely Related Answers

Not possible to fast-forward, aborting.

Comment

git pull --rebase

Popularity 7/10 Helpfulness 5/10 Language shell

Source: Grepper

Tags: shell

Link to this answer
Share Copy Link

Contributed on Jan 16 2023

VivaLaBagget

0 Answers Avg Quality 2/10

Not possible to fast-forward, aborting

Comment

If
git pull 
does not do the trick and if you want to merge both the current changes and the changes that'd come from the pull of the branch from origin then do this:-

git merge origin/BRANCH_NAME 
After that, resolve the merge conflicts if any and done for the day.

Popularity 8/10 Helpfulness 4/10 Language whatever

Source: www.thecodeteacher.com

Tags: whatever

Link to this answer
Share Copy Link

Contributed on Sep 09 2022

e-mallz contact

0 Answers Avg Quality 2/10

fast-forward, aborting

Contents

More Related Answers

fast-forward, aborting

Closely Related Answers

Not possible to fast-forward, aborting.

Not possible to fast-forward, aborting

Grepper

Documentation

Social

Legal

Contact

Oops, You will need to install Grepper and log-in to perform this action.