Jump to content

Command line test for merge conflicts


Recommended Posts

How can I simulate a merge from main into a branch for the purpose of knowing if there is or isn't any merge-conflicts (which I plan to persist as a branch attribute) ? It's essentially what happens with automatic merge in teamcity using the plugin but I'd like to not actually perform the merge into main.


The merge would typically be 2-5 branches at a time into a single commit (also don't know how to do this via command line) and after some thought, was thinking maybe there's a way to accomplish this into a shelveset at main that would serve as the dry-run of the merge which would also provide the binary output "can all outstanding branches be merged without conflict".

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
  • Create New...