@shivanshshrivas/gwit 0.2.1 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -6
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -125,15 +125,18 @@ gwit sync --back feature/auth # three-way merge worktree -> main
|
|
|
125
125
|
gwit sync --back # auto-detect branch, then merge back
|
|
126
126
|
```
|
|
127
127
|
|
|
128
|
-
`--back` compares three versions of each snapshot-tracked file:
|
|
128
|
+
`--back` compares three versions of each snapshot-tracked file:
|
|
129
129
|
|
|
130
130
|
1. **base** - file content captured when the worktree was created
|
|
131
131
|
2. **main** - current file in the main worktree
|
|
132
|
-
3. **worktree** - current file in the linked worktree
|
|
133
|
-
|
|
134
|
-
If both sides changed different text regions, gwit applies a clean merge.
|
|
135
|
-
If both sides changed the same region, gwit writes git-style conflict markers
|
|
136
|
-
(`<<<<<<<`, `=======`, `>>>>>>>`). Binary conflicts are skipped with a warning.
|
|
132
|
+
3. **worktree** - current file in the linked worktree
|
|
133
|
+
|
|
134
|
+
If both sides changed different text regions, gwit applies a clean merge.
|
|
135
|
+
If both sides changed the same region, gwit writes git-style conflict markers
|
|
136
|
+
(`<<<<<<<`, `=======`, `>>>>>>>`). Binary conflicts are skipped with a warning.
|
|
137
|
+
Files currently matched by `.gwitinclude` but not present in the snapshot
|
|
138
|
+
(for example, new files created later inside an included ignored directory)
|
|
139
|
+
are reverse-copied directly from worktree to main.
|
|
137
140
|
|
|
138
141
|
### `gwit open <branch>`
|
|
139
142
|
|