clsync 1.1.0__tar.gz → 1.1.2__tar.gz

{clsync-1.1.0 → clsync-1.1.2}/.gitlab-ci.yml

@@ -43,7 +43,7 @@ publish_to_gitlab_registry:
       TWINE_USERNAME=gitlab-ci-token
       TWINE_PASSWORD=${CI_JOB_TOKEN}
       python -m twine upload
-      --repository-url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi"
+      --repository-url "http://gitlab:8081/api/v4/projects/${CI_PROJECT_ID}/packages/pypi"
       dist/*
   rules:
     - if: $CI_COMMIT_TAG

{clsync-1.1.0 → clsync-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clsync
-Version: 1.1.0
+Version: 1.1.2
 Summary: Sync Claude Code knowledge across machines via a shared git repository and AI-powered synthesis
 Project-URL: Homepage, https://gitlab.hahtse.de/published/claudesync
 Project-URL: Repository, https://gitlab.hahtse.de/published/claudesync
@@ -201,7 +201,7 @@ pipx install .
 Verify:
 
 ```bash
-clsync --help
+clsync --version
 ```
 
 For development (editable install with test dependencies — use pip, not pipx):
@@ -398,6 +398,13 @@ To skip all safety checks (running process detection and large-diff confirmation
 clsync pull --force
 ```
 
+To resolve git conflicts automatically (e.g. after a concurrent synthesis):
+
+```bash
+clsync pull --resolve mine    # keep your local version on conflict
+clsync pull --resolve theirs  # keep remote version on conflict
+```
+
 ### Push, synthesize, and pull in one command
 
 ```bash
@@ -406,6 +413,12 @@ clsync sync
 
 This runs push → waits for the pipeline to complete → pull, in sequence.
 
+`--resolve` is also accepted by `sync` and applies to both the initial pull and the final pull step:
+
+```bash
+clsync sync --resolve theirs
+```
+
 ### Trigger the pipeline without pushing
 
 ```bash
@@ -487,7 +500,16 @@ If only one machine has content for a scope, it is copied directly without an AP
 
 ### Conflict markers
 
-When two machines contradict each other and the synthesizer cannot determine which is correct, it writes:
+There are two kinds of conflicts:
+
+**Git-level conflicts** occur when two machines push to the sync repo concurrently and `git pull --rebase` cannot auto-merge. These can be resolved automatically with the `--resolve` flag:
+
+```bash
+clsync pull --resolve theirs  # keep the remote version
+clsync pull --resolve mine    # keep the local version
+```
+
+**Synthesis-level conflicts** occur when two machines contradict each other in content and the synthesizer cannot determine which is correct. It writes:
 
 ```
 <!-- CONFLICT: [description] — resolve manually -->

{clsync-1.1.0 → clsync-1.1.2}/README.md

@@ -165,7 +165,7 @@ pipx install .
 Verify:
 
 ```bash
-clsync --help
+clsync --version
 ```
 
 For development (editable install with test dependencies — use pip, not pipx):
@@ -362,6 +362,13 @@ To skip all safety checks (running process detection and large-diff confirmation
 clsync pull --force
 ```
 
+To resolve git conflicts automatically (e.g. after a concurrent synthesis):
+
+```bash
+clsync pull --resolve mine    # keep your local version on conflict
+clsync pull --resolve theirs  # keep remote version on conflict
+```
+
 ### Push, synthesize, and pull in one command
 
 ```bash
@@ -370,6 +377,12 @@ clsync sync
 
 This runs push → waits for the pipeline to complete → pull, in sequence.
 
+`--resolve` is also accepted by `sync` and applies to both the initial pull and the final pull step:
+
+```bash
+clsync sync --resolve theirs
+```
+
 ### Trigger the pipeline without pushing
 
 ```bash
@@ -451,7 +464,16 @@ If only one machine has content for a scope, it is copied directly without an AP
 
 ### Conflict markers
 
-When two machines contradict each other and the synthesizer cannot determine which is correct, it writes:
+There are two kinds of conflicts:
+
+**Git-level conflicts** occur when two machines push to the sync repo concurrently and `git pull --rebase` cannot auto-merge. These can be resolved automatically with the `--resolve` flag:
+
+```bash
+clsync pull --resolve theirs  # keep the remote version
+clsync pull --resolve mine    # keep the local version
+```
+
+**Synthesis-level conflicts** occur when two machines contradict each other in content and the synthesizer cannot determine which is correct. It writes:
 
 ```
 <!-- CONFLICT: [description] — resolve manually -->

{clsync-1.1.0 → clsync-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "clsync"
-version = "1.1.0"
+version = "1.1.2"
 description = "Sync Claude Code knowledge across machines via a shared git repository and AI-powered synthesis"
 readme = "README.md"
 license = {text = "MIT"}