diegohb Posted October 12, 2022 Report Share Posted October 12, 2022 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 More sharing options...
Recommended Posts
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 accountSign in
Already have an account? Sign in here.
Sign In Now