Pull request - non-ff git merge required?

When I initiate a pull request, bitbucket only gives me the option to do a non-fast-forward merge to bring changes in. Why is this? I can see why some people might like it that way, but it makes the history less readable too. Are there any options where I can either request a fast-forward merge or rebase if possible when accepting a pull request?

1 answer

0 votes
Jason Worley Atlassian Team Apr 19, 2013

Greetings!

This is a question we field on occassion. We actually leverage Git's native behavior. In other words, by default, the client will throw an error and prompt users add --force.

That being said, you can opt to toggle this flag.

I hope this response was helpful.

Happy Coding! :)

Cheers,
Jason | Atlassian

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Mar 14, 2019 in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

247 views 0 12
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you