Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Speed up your Pull Requests

If your Pull Request is staying open for too long due to missing reviews, you are falling into the danger of long-living branches causing merge conflicts, context switches etc. 

Ship, Show, Ask is a modern branching strategy that lets you combine advantages of Pull Requests with the ability to ship changes fast.

Here's how it works:

1. Ship. 

You want to make a change, so you make it directly on your mainline. When you do this, you’re not waiting for anyone to take your change to production. You’re not asking for a code review.

2. Show 

You make your change on a branch, you open a Pull Request, then you merge it without waiting for anyone. You’ll want to wait for your automated checks (tests, code coverage, preview environments, etc.), but you don’t wait for anyone’s feedback to proceed with taking your change live.’
     

3. Ask 

Here we pause. We make our changes on a branch, we open a Pull Request, and we wait for feedback before merging.`


Our recommendation to speed up your Pull Requests, which worked for us:

We use Show for PRs with proven changes where we have little doubt that it causes problems:

  • Fixed vulnerable OSS dependency version, 
  • Updated documentation, typo and spelling fixes
  • Small Changes we already discussed, like changing a setting

Meantime we still run the CI pipeline and to get notified our colleagues so they can have a look later. To mark a Pull Request as a Show Pull Request, we add [SHOW] as a prefix to the pull request title so that everybody sees the intention of the PR. These pull requests are automatically merged by our in-house developed tool DevSensei.

If we are unsure and need the feedback of our colleagues to continue, we use Ask: e.g. when we implement a large new feature, and do an initial WIP PR with a prototype to get feedback (still important to reach out early to colleagues).

 

https://marketplace.atlassian.com/apps/1228648/devsensei-auto-merge-for-bitbucket?hosting=cloud&tab=overview

 

ezgif.com-gif-maker (8).jpg

 

 

 

2 comments

Comment

Log in or Sign up to comment
Tonny Madsen September 21, 2022

It would be sooo nice if you could implement rebase for branches/pull requests... then the "ask" case would be so easier for those of us that prefers a linear Git history and no merge nodes :-)

Michael Rüegg _Mibex Software_
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
September 29, 2022

@Tonny Madsen  Thanks for your interest in DevSensei.

Would you be available for a quick call to discuss your requirements in detail? If yes, please schedule a call.

TAGS
AUG Leaders

Atlassian Community Events