How do I merge a branch back into the master API proxy?

 Here are the basic steps to merge a branch back into the master API proxy in Apigee:

1. Go to the API Proxies page and locate the branched API proxy.

2. Click the menu icon (3 vertical dots) and select "Merge into another API proxy".

3. Choose the API proxy you want to merge the branch into. This is typically the master branch API proxy.

4. On the next screen, select whether to:

• Merge configuration only: Only merges policy configs, no proxy endpoints or resources
• Merge all: Fully merges all configs, endpoints, and resources. In case of conflict, the target API proxy takes precedence.

5. If there are any merge conflicts (e.g. two branches modifying the same element), Apigee will show them on the next screen. You have two options:

• Select the source (branched) version to overwrite the target.
• Select the target version to keep as-is and ignore the branched version.

Resolve all conflicts this way.

6. Preview the merged API proxy. Apigee shows a diff of the changes that will be merged.

7. Click "Merge". Apigee will:

• Merge the selected configs and resources from the branch into the target API proxy
• Increment the target's revision number
• Retire the branch API proxy (if set to auto-retire during merge)

8. The target API proxy will now contain the changes from the merged branch. You can validate and deploy the new revision.

9. Repeat this process for merging additional branches into the master API proxy as needed.

Hopefully these steps help give you a clear overview of how to merge branches in Apigee! Let me know if you have any other questions about managing feature branches for your API proxies.