How to prevent merging the target branch ('XYZ' branch) from source branches ('ABC' branch)

[sharathjagadish]

How to implement to preventing developers from accidentally merging specific branch from a specific branch?

Question

Body

How to prevent merging the target branch ('XYZ' branch) from source branches ('ABC' branch)
but i can merge 'PQR' branch and any other branches into XYZ branch

how to apply ruleset to only prevent merging the target branch ('XYZ' branch) from source branches ('ABC' branch)

How to implement to preventing developers from accidentally merging specific branch from a specific branch?

[Abe0770]

I think you can use branch protection in the repository settings.

repo > settings > branches > add branch protection rule > enter branch name
and check the rule that needs to be applied to the given branch name (like require pull request or lock branch).

[sharathjagadish]

where to mention target branch and source branch ?

[Abe0770]

You can put the target branch name in the branch name pattern field and check the "require a pull request before merging" and "do not allow bypassing the above settings (optional)" options so that any merge attempts will require a pull request (This will help to prevent accidental merging by going through a pull request). I'm not sure about how to restrict only a particular branch from merging.

[nitink3450]

To prevent developers from accidentally merging a specific source branch ('ABC' branch) into a target branch ('XYZ' branch), you can use branch protection rules in your version control system, such as Git. Below are the steps to implement this:

1. Access Control: Ensure that you have the necessary permissions to configure branch protection rules in your repository.

2. Git Repository: Navigate to the Git repository where you want to enforce these rules.

3. Branch Protection Rules:

   • GitHub: If you're using GitHub, go to your repository, click on "Settings," then select "Branches" from the left menu.
   • GitLab: For GitLab, go to your repository, click on "Settings," and then select "Repository" from the left sidebar.

4. Choose the Branch: Find the 'XYZ' branch that you want to protect and click on it.

5. Branch Protection Settings:

   • GitHub: In GitHub, you'll find a section called "Branch protection rules." Click on "Add rule."

   • GitLab: In GitLab, scroll down to the "Protected branches" section and click on "Protect."

6. Define Protection Rules:

   • Branch Name: Specify 'XYZ' as the branch name you want to protect.

   • Rule Name (Optional): Give your rule a descriptive name.

   • Protect this branch: Check this option to protect the 'XYZ' branch.

7. Protect 'XYZ' Branch from 'ABC' Branch:

   • Under "Require pull request reviews before merging," enable it.
   • Under "Require review from code owners," you can specify code owners or required reviewers.
   • Under "Require status checks to pass before merging," configure specific checks that should pass. You can set up CI/CD checks or other automated processes to ensure that merging from 'ABC' branch is blocked.

8. Save Changes: Save the branch protection settings.

9. Test: Try to merge 'ABC' branch into 'XYZ' branch to ensure that it is blocked. You can create a pull request from 'ABC' to 'XYZ' to test this.

This setup will prevent developers from accidentally merging 'ABC' branch into 'XYZ' branch by requiring code reviews and passing status checks for any changes made to 'XYZ'. However, developers should still be able to merge 'PQR' and other branches into 'XYZ' without any issues.

Please note that the exact steps and options may vary depending on the Git hosting platform you are using (e.g., GitHub, GitLab, Bitbucket, etc.). The steps above provide a general guideline, but you should refer to your specific platform's documentation for precise instructions.

[sharathjagadish]

Thanks a lot
i am using GitHub
mainly we need to use CI/CD checks for source and target branch ?
if yes any sample workflow file to check above condition or automated processes to block (mention both source and target branch )

[Olshansk]

This thread seems related to our goal but I have yet to find a solution.

Here's the end goal

Allow:

• PR from branch1 against main
• PR from barnch2 against branch1
• Squash & merged branch1 into main
• Squash & merged branch2 into main

Disallow:

• Squash & merge branch2 into branch1

---

I found the configs below, and I believe it'll require a form of !main.

Could someone confirm whether the end goal I described above is possible or not?

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬