Project Merge Fails Due To mds File Conflict
Here is the workflow:
1. Team member syncs the "main" branch to the "main" GitHub branch.
2. Team member creates a branch off of the local "main" to work on.
3. Team member switches to the newly created branch, makes changes, and commits.
4. Team member pulls from GitHub the "main" branch to get other team member's work into the local "main" branch.
5. Team member tries to merge the local branch that contains the updates to the local "main" branch, prior to push the code.
The merge process between the local branch that contains the work and the main main local branch results in a conflict. The mds file is changed. This issues has caused errors as well as diverging branches.
Any suggestions?
Is it better to do all the code version control tasks via git bash?
Thanks.
Here is some example to encode into base64:
def data = "Hello, world!" def encodedData = data.bytes.encodeBase64().toString() log.info "Encoded data: $encodedData"if you want to use in your json payload, then there are multiple ways
1. store the encoded value in a test case custom property and use that in json
2. Use inline code in JSON such as "${= "Hello World".bytes.encodeBase64().toString()}"
