You're almost there! Please answer a few more questions for access to the Applications content. Complete registration
Interested in joining? Complete your registration by providing Areas of Interest here. Register

How to resolve conflicts using Command line

Summary:

Hi everyone. we got 5 conflicts while merging our changes to SIT. we usually review the conflicts and update the review branch. but this time its saying we need to resolve them manually using command line since its more than the alowed size.. can someone pleae suggest on how to do that in VBS

Thanks,

Prabhakar

Content (please ensure you mask any confidential information):


Version (include the version you are using, if applicable):



Code Snippet (add any code snippets that support your topic, if applicable):

Tagged:

Howdy, Stranger!

Log In

To view full details, sign in.

Register

Don't have an account? Click here to get started!