TechPrufer
Get started
Atlassian
Atlassian logoAtlassian · Feature trail

Automated Git Branch Merging

3 posts · Feb 2012 – Sep 2024

What this trail covers

Bitbucket Cloud enhances its pull request experience with automated merging of branches and forks. This feature allows users to sync their feature branches and forks with the main branch with a single click, reducing merge conflicts and simplifying workflow management. It also enables direct merging from the compare view and deletion of feature branches directly from the feature branches page. This post introduces the ability to create pull requests between branches, streamlining collaboration and adding rebase sync and expanded merge strategies (rebase + merge, rebase + fast forward, squash (fast forward only)).

All Atlassian trails
  1. Git, your way: Bitbucket's expanded sync & merge optionsThis post introduces two new strategies for syncing branches in Bitbucket Cloud: 'rebase sync' and 'merge commit'. It also expands merge strategies to include 'rebase + merge', 'rebase + fast forward', and 'squash (fast forward only)'. These options provide users with more control over their Git history management within the Bitbucket UI.
  2. Git: automatic merges with server side hooks (for the win!)The post details a manual shell script for cascading merges from stable branches (e.g., 2.1) to newer branches (2.2, 2.3, master). It then presents a Python implementation of a server-side Git 'update' hook to automate this process, including core logic for merging and resetting on failure. Finally, it introduces Stash's built-in feature for automated branch merging based on repository topology configuration.
  3. Syncing and merging come to BitbucketThis post introduces automated syncing of feature branches and forks with the main branch directly from the Bitbucket UI. It also adds the ability to delete feature branches from the feature branches page and perform merges directly from the compare view.
  4. Pull requests across branchesIntroduced the ability to create pull requests between branches, enabling collaboration and code reviews within teams. Added features to pre-populate pull request titles with commit messages, allow pull request creators to reject their own requests, and detect when a pull request's changes have been rebased.