StackOverflow Questions for Tag: fast-forward

Rachel Nicolas

Reputation: 1155

GitLab says merge conflicts must be resolved but there are no conflicts

gitgitlabrebasemerge-conflict-resolutionfast-forward

Score: 0

Answers: 2

Davide Casiraghi

Reputation: 18087

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

gitgit-mergegit-pullgit-configfast-forward

Score: 1396

Answers: 35

adrianvlupu

Reputation: 4618

What is fast-forwarding?

gitfast-forward

Score: 343

Answers: 3

NFeruch - FreePalestine

Reputation: 1145

How is the author and commit message of a squashed merge commit determined?

gitgit-mergesquashfast-forward

Score: 0

Answers: 2

idbrii

Reputation: 11916

Does git have a built-in command to ffwd all tracking branches?

gitgit-pullfast-forward

Score: 0

Answers: 2

Florian Pilz

Reputation: 8028

Why does git perform fast-forward merges by default?

gitgit-branchgit-mergefast-forward

Score: 670

Answers: 2

umläute

Reputation: 31254

How to do a fast-forward merge on GitHub?

githubgit-mergefast-forward

Score: 145

Answers: 7

Jason Baker

Reputation: 198517

Can I make fast forwarding be off by default in Git?

gitmergebranchrebasefast-forward

Score: 305

Answers: 5

H.v.M.

Reputation: 1633

Why does fast-forwarding with git fetch reject an ahead branch?

gitgit-mergegit-fetchfast-forward

Score: 1

Answers: 0

Rasmus Bækgaard

Reputation: 1838

Prevent commits in master branch

gitmergefast-forward

Score: 164

Answers: 3

Newo

Reputation: 445

Git Merge Fast-Forward vs Git Rebase

gitgit-mergegit-rebasefast-forward

Score: 32

Answers: 2

user1162226

Reputation: 13671

What effect does the `--no-ff` flag have for `git merge`?

gitmergefast-forward

Score: 1357

Answers: 7

bguiz

Reputation: 28577

git merge with --no-ff and --squash

gitmergebranchsquashfast-forward

Score: 6

Answers: 1

user2641570

Reputation: 814

Gitlab merge request fast forward merge

gitlabfast-forward

Score: 9

Answers: 2

1026

Reputation: 1

Why I am getting Updates were rejected because the tip of your current branch is behind message even though I am pushing to a new repo just created

gitazure-devopsfast-forward

Score: 0

Answers: 1

soad

Reputation: 71

Can I imitate fast-forwarded pull if my local branch diverges with remote in Git?

gitrebasepullfast-forward

Score: 0

Answers: 1

anna

Reputation: 433

How to merge with merge commit

gitgit-mergegit-commitfast-forward

Score: 0

Answers: 0

JackTheKnife

Reputation: 4144

git merge --ff creates merge commit

gitgitlabfast-forward

Score: 0

Answers: 1

Nick Kinlen

Reputation: 1406

Can't push to Github non-fast-forward error

gitgithubgithub-pagesgit-pullfast-forward

Score: 0

Answers: 2

Radio Controlled

Reputation: 950

Using git to track deployable state of code

gitdeploymentbranchproductionfast-forward

Score: 0

Answers: 1

PreviousPage 1Next

StackOverflow Questions for Tag: fast-forward

GitLab says merge conflicts must be resolved but there are no conflicts

How can I deal with this Git warning? &quot;Pulling without specifying how to reconcile divergent branches is discouraged&quot;

What is fast-forwarding?

How is the author and commit message of a squashed merge commit determined?

Does git have a built-in command to ffwd all tracking branches?

Why does git perform fast-forward merges by default?

How to do a fast-forward merge on GitHub?

Can I make fast forwarding be off by default in Git?

Why does fast-forwarding with git fetch reject an ahead branch?

Prevent commits in master branch

Git Merge Fast-Forward vs Git Rebase

What effect does the `--no-ff` flag have for `git merge`?

git merge with --no-ff and --squash

Gitlab merge request fast forward merge

Why I am getting Updates were rejected because the tip of your current branch is behind message even though I am pushing to a new repo just created

Can I imitate fast-forwarded pull if my local branch diverges with remote in Git?

How to merge with merge commit

git merge --ff creates merge commit

Can&#39;t push to Github non-fast-forward error

Using git to track deployable state of code

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

Can't push to Github non-fast-forward error