@shivanshshrivas/gwit 0.2.0 → 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 +18 -9
- package/package.json +14 -2
package/README.md
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
|
-
# gwit
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
# gwit
|
|
2
|
+
|
|
3
|
+
[](https://www.npmjs.com/package/@shivanshshrivas/gwit)
|
|
4
|
+
[](https://www.npmjs.com/package/@shivanshshrivas/gwit)
|
|
5
|
+
[](https://github.com/shivanshshrivas/gwit/actions/workflows/ci.yml)
|
|
6
|
+
[](https://nodejs.org/)
|
|
7
|
+
[](./LICENSE)
|
|
8
|
+
|
|
9
|
+
Fully isolated git worktrees, in one command.
|
|
4
10
|
|
|
5
11
|
gwit wraps `git worktree` to turn a fresh checkout into a fully working environment - gitignored files copied, unique port assigned, per-worktree env vars injected, and setup scripts run automatically.
|
|
6
12
|
|
|
@@ -119,15 +125,18 @@ gwit sync --back feature/auth # three-way merge worktree -> main
|
|
|
119
125
|
gwit sync --back # auto-detect branch, then merge back
|
|
120
126
|
```
|
|
121
127
|
|
|
122
|
-
`--back` compares three versions of each snapshot-tracked file:
|
|
128
|
+
`--back` compares three versions of each snapshot-tracked file:
|
|
123
129
|
|
|
124
130
|
1. **base** - file content captured when the worktree was created
|
|
125
131
|
2. **main** - current file in the main worktree
|
|
126
|
-
3. **worktree** - current file in the linked worktree
|
|
127
|
-
|
|
128
|
-
If both sides changed different text regions, gwit applies a clean merge.
|
|
129
|
-
If both sides changed the same region, gwit writes git-style conflict markers
|
|
130
|
-
(`<<<<<<<`, `=======`, `>>>>>>>`). 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.
|
|
131
140
|
|
|
132
141
|
### `gwit open <branch>`
|
|
133
142
|
|
package/package.json
CHANGED
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivanshshrivas/gwit",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"description": "Fully isolated git worktrees for parallel development",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"git",
|
|
7
|
+
"git-worktree",
|
|
8
|
+
"worktree",
|
|
9
|
+
"cli",
|
|
10
|
+
"developer-tools",
|
|
11
|
+
"typescript",
|
|
12
|
+
"parallel-development",
|
|
13
|
+
"monorepo",
|
|
14
|
+
"automation",
|
|
15
|
+
"ai-agents"
|
|
16
|
+
],
|
|
5
17
|
"license": "MIT",
|
|
6
18
|
"engines": {
|
|
7
19
|
"node": ">=20.0.0"
|
|
8
20
|
},
|
|
9
21
|
"bin": {
|
|
10
|
-
"gwit": "
|
|
22
|
+
"gwit": "dist/index.cjs"
|
|
11
23
|
},
|
|
12
24
|
"files": [
|
|
13
25
|
"dist"
|