Improved TC collections merging

[bombillazo]

Please describe feature/problem details and the solution you'd like.

When multiple devs make individual changes to a thunder client collection, at the time of merging and resolving conflicts, there are issues to keep the desired changes. At the moment, we manually resolve conflicts.

Describe alternatives you've considered

Ideally one can have a type of conflict resolver UI to see diff and in a smart intuitive way be able to keep or merge individual requests instead of doing it directly in the JSON code.

Are you using the free version/paid version/trial:

Paid

[rangav]

Thanks @bombillazo for the feedback.

Did you try using the vscode 3 way merge editor?

[bombillazo]

Hey, no I have not tried it. How can I try it out? Our main issues happen when we merge the main branch to our feature branch.

[rangav]

See this link for details
https://code.visualstudio.com/docs/sourcecontrol/overview#_3way-merge-editor

[bombillazo]

Ahh, yes, we've used this, but it's still not a "smart" way to merge things in the context of API requests. One has to reconcile objects in the code manually...

This is for sure a nice to have since it's a bit complex to analyze the current vs incoming changes in a way that one can see the discreet request properties that changed instead of simply JSON code sections. I am thinking something like what Postman does: https://learning.postman.com/docs/collaborating-in-postman/using-version-control/reviewing-pull-requests/#viewing-the-diff

[rangav]

Thanks for the feedback, Will review it.

You can also try the 4 way vscode editor as an alternative - microsoft/vscode#155277 (comment)

[rangav]

Hi @bombillazo

We have a feature request for splitting collection into multiple request files to reduce merge conflicts - #1507

Can you please let me know your feedback as its related to this

[rangav]

@bombillazo

We have implemented a new database design to reduce merge conflicts.

Update extension to v2.23.0 and follow the instructions in the below link

https://github.com/thunderclient/thunder-client-support/releases/tag/v2.23.0

Please upgrade to the new format and let us know your feedback.

[rangav]

@bombillazo any feedback?

[bombillazo]

Hey, so far it works

[rangav]

Thanks @bombillazo for the confirmation.

let me know if you have any issues with the new format.