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

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent br...

What is fast-forwarding?...

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?...

Prevent commits in master branch...

Git Merge Fast-Forward vs Git Rebase...

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

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

git merge --ff creates merge commit...

Using git to track deployable state of code...

Skip post-merge hook when fast-forwarding...

Git: Android Studio "--ff-only" merge option is greyed out...

Fast Forward implementation in Realtime Audio byte array in java...

Using GitHub website for non-fast-forward merging of PRs, instead of Git CLI...

When to use the '--no-ff' merge option in Git...

Is there a way to get Git to print out the "fast forward" tasks between two commits?...

fast-forward error in Github...

git fast-forward one commit...

How can I prevent non-fastforward pushes to selected branch(es) in git?...

What does the `Rebase and merge` merge strategy do on Bitbucket Server?...

Git Merge --no-ff makes copy of commits...

What are the differences between `--squash` and `--no-ff --no-commit`?...

A new file, git demands a merge, why?...

How can I find what is preventing a fast forward merge?...

VSTFS 2015 - Merge Pull request set no-ff...

Merge first n commits of branch to master...

What is the difference between git merge --ff <commit> and git reset <commit> --mixed...

Will Github count contributions from branches merged by -no-ff merge (not fast forward)?...