Merge changes in pull requests

As an administrator or Git repository owner, you can set the merge rule that enables approved pull requests to merge automatically into the target stream or branch. If the automatic merge isn't enabled, you can merge pull requests manually.

For details about topic streams and pull requests, see the Dimensions CM help.

Merge pull requests automatically

As an administrator, you can enable approved pull requests to merge automatically.

If the parent stream or branch are configured to automatically merge pull requests, when a review moves to the Approved state, the pull request is automatically merged into its parent stream or branch.

Automatic merging works only if there are no conflicts when the pull request moves to the Approved state.

Note: If a merge fails, the pull request can be sent back to the Rework state and then approved again.

To merge a pull request automatically:

  1. In PulseUno, navigate to Spaces, select a space and then a product or Git repository.
  2. To enable the automatic merge for a particular stream or branch, select the stream or branch.
  3. In the sidebar, select Settings > Reviewing Changes.
  4. In the Pull Requests section, from the Merge Rule list, select a rule that enables automatic merges. For details about merge rules, see Create and apply merge rules.
  5. Click Save.

Back to top

Merge pull requests manually

If the parent stream or branch has not been configured to automatically merge approved pull requests, or if a pull request fails to merge automatically, you can do a manual merge, provided there are no conflicts between the contents of the topic stream/branch and its target stream/parent branch.

To merge a pull request manually:

  1. In PulseUno, navigate to Spaces, select a space and then a product or Git repository.
  2. (Optional) To restrict the scope of the search, select a stream or branch.
  3. In the sidebar, select Reviews.
  4. On the Reviews page, open the pull request that you want to merge to the target stream or branch.
  5. (Optional) In the Conversation tab, review information about the pull request, and change the following details, as needed.

    Note: You can edit a pull request only if you created it. Otherwise, you need administrator or owner permissions.

    Description To update the pull request's description, in the Description section, click Edit description .
    Requests

    To merge changes based on a request, in the Requests section, click Relate request .

    To remove the relationship to a request, click Unrelate request .

    Merge Target

    To change the stream/branch to which you will merge the pull request, in the Merge Target section, click Change target branch .

    You can select any stream/branch in your current product or Git repository.

  6. Click Merge Pull Request.
  7. Add a merge comment and click Merge. If the merge is successful, the pull request is automatically closed. If the merge fails, a warning is displayed.

Back to top

See also: