Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

This page describes the behavior behaviour of the DevSensei Ship/Show/Ask feature in details. Refer to About Ship/Show/Ask PR workflow for description and motivation of Ship/Show/Ask.

...

All pull requests are characterized by DevSensei in 5 different categories. The behavior behaviour of these categories is summarized in the table below.

Auto-merge ?

Number of require approvals

Skipping Code Owners merge checks?

No Ship/Show/Ask

No

0

No

Ask>=n

No

n

No

Show

Yes

0

Yes

Show>=n

Yes

n

Yes

Ship

Yes

0 (And Skip Code Owners )

Yes

Info

Note that when you are not using full Ship/Show/Ask support, the Auto merge [Auto] behavior behaviour is equivalent to [Show], except that it does not skip the Code Owners merge checks.

Ask pull requests

When an [Ask>=n] pull request is initiated, it will not be merged automatically. Moreover, a merge check requiring n (>=1) approvals is added to the pull request. This means that in order for the pull request to be successfully merged, it must receive n approvals from designated reviewers or team members.

...

[Show>=n] pull requests will be automatically merged as soon as they receive n approvals. In addition, all However, Code Owners merge checks will be ignored for such pull request. All other merge checks (such as passing tests, no open tasks, etc.) must still be fulfilled for the pull request to be merged.

[Show] pull requests, on the other hand, will not require any approvals before they can be automatically merged. This feature is useful for small changes that do not require a thorough review. However, Again, Code Owners merge checks will be ignored but all other merge checks must still be fulfilled before the pull request can be merged.

...

[Ship] pull requests are similar to [Show] pull requests, with the difference that they do not add the Code Owners as reviewers anymore. That means that no one will be notified about the pull request.

Like [Show] pull requests, [Ship] pull requests will be merged as soon as all other merge checks pass, but they skip Code Owners assignments from Code Owners.

To initiate a [Ship] pull request, the user must select Auto-Merge, they should not require any approvals and they must select Merge without reviewers.

...

For the most part, DevSensei and Code Owners are two independent features next to each other. The only exception is the interaction regarding However, DevSensei will skip Code Owners merge checks in the event of a [Ship] or [Show] pull requestsrequest.

In particular:

  • a [Show] pull request doesn’t require any approvals to be merged. HoweverMoreover, if Code Owners requires approvals for that same pull request, they will not be skipped. Therefore the pull request will not be automatically merged before even if Code Owners merge checks are not fulfilled.

  • a [Show>=2] pull request will require two approvals, regardless of who they are coming from. If for its part, Code Owners requires 3 approvals as merge checkthe merge checks on your repository are configured to require 3 approvals, then in total only 3 approvals will be necessary. Code Owners merge checks will be skipped.

  • The same applies for [Ask>=2], but they the key difference being is that Ask does the Ask pull request will not skip Code Owners merge checks. The other difference is that it will not auto-merge.

  • a [Ship] pull request will skip assignment of Code Owners. This is inline with the philosophy of Ship/Show/Ask: Ship pull request are meant for tiny and trivial changes to your repository. Such changes will be more effective if you don’t bother other team members to carry them through.

I accidentally

...

created a pull request in the wrong category, can I do something about it?

DevSensei uses the title of a pull request to determine its category. For example a [Show>=2] pull request will have its title start with [SHOW>=2]. If you modify the title of the pull request after it has been created, it will also change its category for DevSensei.

...

  • after creating the pull request, create an open task to prevent the merge (note that if that is the only merge check on your repository, you only have 20 seconds to do so – see “When does DevSensei check if a pull request must be auto-merged?”)

  • you can create the pull request selecting “Manual merge”, and change the title to so that it starts with [SHOW>=n] (with n replaced with the desired number) or with [SHOW] when it is not longer work in progress.

I want to use Ship/Show/Ask but I don’t want Ship or Show to skip Code Owners

This is something that is currently not supported. If you would be interested in such a feature, we will be happy to hear from you!

...