Reduce merge conflicts - Githubissues

thunderclient / thunder-client-support

Thunder Client is a lightweight Rest API Client Extension for VS Code.

https://www.thunderclient.com

Other

3.61k stars 126 forks source link

Reduce merge conflicts #1507

Closed rangav closed 3 months ago

rangav commented 5 months ago

@max-mykhailenko requested this feature.

Do you plan to split database to multiple files? There are a lot of conflict when 10 backend developers working inside one collection and it's super hard to resolve conflict in files that takes 14k rows. Maybe you can also suggest some smart git settings that prevents it?

New Database Design

Collection in UI

Database Design v3 (Current)

One file per collection

NEW Database Design v4

One file per request

How to upgrade to v4

From command palette select -> Upgrade Database to v4

Downgrade to v3

If you like downgrade back to v3 format, Please copy collection files from _db-backupv3 back to collections folder

rangav commented 5 months ago

Please let us know if your company needs this feature

We will review this feature request and provide an update soon.

cw1934 commented 4 months ago

My group is very interested in this feature, any update on the progress since last activity?

rangav commented 4 months ago

@cw1934 Thanks for the feedback. It's still in the research phase, We will provide an update soon in around 2-4 weeks.

rangav commented 4 months ago

We have completed the database redesign changes and will publish an update in a week after conducting some internal testing.

rangav commented 3 months ago

We have implemented a new database design to reduce merge conflicts. Please upgrade to the new format and let us know your feedback.

Update extension to v2.23.0 and follow above instructions

rangav commented 3 months ago

@cw1934 @max-mykhailenko

Can you please let us know your feedback on the NEW database design?

In future releases, we plan to automatically upgrade all users to this new DB design, so it would be beneficial to receive your feedback now.

max-mykhailenko commented 3 months ago

@rangav We put this update into our roadmap. I hope in the next few weeks we will migrate

cw1934 commented 3 months ago

@rangav We moved a couple solutions over today, and will continue to evaluate/test across multiple users and report back with any issues or comments.

rangav commented 3 months ago

@cw1934 thanks for the update.

we plan to support both v3 and v4 format. You can choose the format that suits your team.