|
|
|
|
|
by kannonboy
3630 days ago
|
|
Bitbucket engineer here! In Bitbucket Cloud - i.e. bitbucket.org - we cap the diff size for pull requests at 10000 lines. In Bitbucket Server we also cap the number of lines in a particular diff at 10000 by default, but you can override this number[0], along with all other timeouts and thresholds with our various configuration properties. One of the engineering values of the Server team is "no hardcoded constants" - so you can configure basically any property that you like to suit your particular deployment. Both Bitbucket Server and Cloud also generate a subtly different - and in our opinion more correct - diff than you'll find in GitLab and GitHub. Bitbucket actually creates a hypothetical merge commit between your two branches and shows the diff between it and the tip of the target branch. This means we can nicely render merge conflicts in the UI, and show how your target branch will actually be affected by the merge (rather than just the changes on the source branch). I wrote an article that discusses our merge algorithm in more depth[1] a little while ago. [0]: https://confluence.atlassian.com/bitbucketserver/bitbucket-s...
[1]: https://developer.atlassian.com/blog/2015/01/a-better-pull-r... edit: correcting my previous statement on diff sizing in Bitbucket Cloud |
|