> For the complete documentation index, see [llms.txt](https://docs.gta.clothing/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://docs.gta.clothing/share-and-sync/resolve-project-sync-conflicts.md).

# Review Sync Conflicts

Choose which version to keep when you and someone else changed the same items

Changes to different clothing items and independent settings are combined automatically. When you and someone else saved changes to the same items, DCT asks which version to keep. Everything else is already merged.

For example, edits to two different drawables are combined. If you both edited the same drawable, you choose whose version of that drawable to keep. These choices cover saved changes, not unsaved Studio drafts.

## Where DCT asks you

* The status bar sync button shows **Needs review**.
* A notice, **Changes need your review**, appears in the corner of the editor with **Review changes**.
* **This project** and **On this PC** show **Needs review** with **Review changes**.
* While DCT runs in the tray, a balloon tells you that the project needs you.

<figure><img src="https://2130288373-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FRsXe3tqSiAvM8iKYjngE%2Fuploads%2Fgit-blob-a55378f9575218447da24bbb5684244979f22fdc%2Fsync-needs-review.png?alt=media" alt="The editor of a test project with Needs review on the status bar sync button and the status line: You and someone else changed the same items. Choose which version to keep. Everything else is already merged."><figcaption><p>Needs review on the status bar.</p></figcaption></figure>

<figure><img src="https://2130288373-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FRsXe3tqSiAvM8iKYjngE%2Fuploads%2Fgit-blob-e307dfcf6b03cdfe09fa19a061f89838a97d242a%2Fsync-needs-review-card.png?alt=media" alt="This project showing Synced with GitHub with Needs review, its explanation and Review changes."><figcaption><p>Review changes opens the choices.</p></figcaption></figure>

## Choose the versions

1. Choose **Review changes**. **Project sync** shows **Some changes need your review** on **This project**. For a project that is not open, **Review changes** on **On this PC** opens it first; the status bar sync button then leads to the review.
2. Each row names what changed on both sides:
   * a clothing item, with its thumbnail and name, **Changed on both sides**
   * **Order of the items**: items were added, removed or moved on both sides
   * **Project settings**: project-wide settings changed on both sides
3. For each row, choose **Keep mine** or **Use theirs**. **Keep all mine** and **Use all theirs** choose the same for every row. The counter shows how many rows you have chosen.
4. Choose **Apply choices**. It becomes available once every row has a choice. Sync continues with your choices.

<figure><img src="https://2130288373-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FRsXe3tqSiAvM8iKYjngE%2Fuploads%2Fgit-blob-59aca3c0561c91c6ab87d8b113b040cf7128b604%2Fsync-review-choices.png?alt=media" alt="Some changes need your review with two test clothing items changed on both sides, Female 0 Pier Camp Shirt Sand set to Keep mine and Female 2 Dockside Striped Tee set to Use theirs, Keep all mine, Use all theirs, 2 of 2 chosen, and Apply choices."><figcaption><p>Choose a version for each item, then apply your choices.</p></figcaption></figure>

{% hint style="warning" %}
**Order of the items** decides the order of the whole item list, and **Project settings** decides all project-wide settings. Read the row before choosing; one choice can cover more than one clothing item.
{% endhint %}

If more changes arrive while you review, the list updates. Check your choices again before applying them.

## When an incoming change waits

A change to an item that is open in [Texture Studio](https://docs.gta.clothing/basics/good-to-know/texture-studio.md) or [Model Studio](https://docs.gta.clothing/basics/good-to-know/model-studio.md), or to unsaved settings or items, waits while unrelated changes arrive. While an open editor holds a change back, the status shows **Waiting for an editor to close**. Save the draft you want to keep, then close the editor. Do not choose **Use theirs** expecting it to include your unsaved draft.

## If sync still can't finish

* **Paused:** choose **Resume sync**.
* **Sign-in or access problem:** check the account and permissions. For a cloud project, ask the owner or a team manager to check your role and the sharing. For Git, check your repository access and the Durty Cloth Tool GitHub App's access.
* **Needs Git attention** or **Paused: branch changed:** something changed outside the project or outside DCT. Resolve it in your Git client in the project folder, then resume. The review panel handles project changes, not every kind of Git change.
* **Waiting for connection:** DCT tries again automatically. Choose **Try again now** to retry right away, and read [Logs](https://docs.gta.clothing/basics/useful-to-know/logs.md) for details. Your files and saved changes are kept.
* **Saved locally. Synchronization could not be queued. Save again to retry.:** save the project again after fixing the reported problem.

**Stop syncing** disconnects this copy and keeps its files. It does not resolve the changes for you and does not delete anything in the cloud or the repository. See [Project Sync](https://docs.gta.clothing/share-and-sync/project-sync.md) for pausing, the tray and the cloud trash.
