Merging branches

Merging branches in a repository with a Design Review is similar to closing and releasing an Engineering Change Order (ECO).

After your team is done reviewing file changes in a Design Review, the next step is to merge the develop branch into the main branch. This creates a new commit snapshot on the main branch that is a copy of the most recent develop commit.

This creates a new baseline to compare subsequent changes.

Before you merge

Before clicking Merge Files, confirm:

• the Design Review has the approvals or final comments your team expects
• develop contains the changes you intend to promote
• main still represents the last approved baseline
• the diff only shows the files you want included in this merge

If anything in the review looks broader than expected, pause and resolve that first so the next baseline stays clean.

Merging the Design Review

Merge Files in a Design Review Pull Request

1. Scroll to the bottom of the Design Review Conversation tab
   

2. Click the Merge Files button to begin merging changes from the reviewed pull request.
   

3. Add final comments

4. Finalize by confirming the file merge to complete the pull request process.
   

5. Congratulations. You've merged two branches and closed out a Design Review. Time to create a release.

Things that can prevent merging

• A reviewer has requested changes that still need to be addressed.
• The develop and main branches have conflicts that must be resolved before merging.
• A teammate pushed new commits after the review was opened, and the review needs to be refreshed.
• Repository permissions do not allow you to merge into the target branch.
• Required checks or branch protection rules are still blocking the merge.

Troubleshooting

If the merge button is unavailable or the merge fails, start with these checks:

1. Refresh the Design Review and confirm you are looking at the latest commits on both branches.
2. Review any conflict or policy message shown in the merge panel.
3. Confirm the review direction is still from develop to main.
4. Ask a repository admin to verify your branch permissions if the problem appears access-related.
5. Resolve branch conflicts, push the updated branch, and reopen the review if needed.

If the diff looks wrong instead of simply blocked, go back to Create A Design Review and verify that your baseline on main and your working changes on develop are set up correctly.