Git and Team Synchronization

Solo offers various ways to collaborate using Git as a synchronization engine. This allows you to keep collections in sync within the team via major services (GitHub, GitLab, Bitbucket) or private servers.

---

Benefits of Git Synchronization

Native integration with Git offers structural advantages:

• Total Control: Data resides in your local or remote repository, without using third-party servers.
• Professional Versioning: Every change has a history, an author, and is reversible.
• Optimized Collaboration: Ability to work offline and synchronize changes on-demand.
• Transparency: Collections are saved in readable JSON format for easy “diff” reviews.

---

Activating Synchronization

1. Link a Repository: Click the Git icon next to a collection’s name in the sidebar.

2. Configure the URL: Enter the remote repository URL (HTTPS or SSH) and its internal path.

3. First Sync: Download the existing collection or upload the local version if the repository is empty.

4. Activity and Sharing: Make changes to requests. When finished, access the Git panel and select “Sync”.

---

Conflict Management

In case of simultaneous changes to the same request, Solo manages conflicts visually and safely. A conflict detected during synchronization is flagged with a lightning bolt icon. Two options are available:

• Keep Ours: Maintain the local version of the request and discard remote changes.
• Keep Theirs: Accept the remote version and update the local collection.

Advanced Resolution

If you prefer manual conflict resolution, selecting “Open in Terminal” launches the system terminal in the repository folder, allowing you to use your chosen Git tools.

---

Advanced Features

Automatic Rebase

To maintain a linear history, Solo uses a pull --rebase strategy by default, avoiding unnecessary merge commits.

Discard Changes

The “Discard All Changes” function allows for instant cancellation of any unsynchronized local changes.

---

Troubleshooting

Git Authentication Error

If the connection fails (e.g., Permission denied (publickey)), verify that SSH keys are uploaded to the system or that HTTPS credentials are saved in the operating system’s password manager. Solo uses the locally installed Git client.

Blocked Rebase

In case of complex conflicts that block the rebase, the “Abort Rebase” button allows you to restore the state prior to the synchronization attempt.

Environment Files

We recommend against synchronizing environment variables containing sensitive data in public or shared repositories.