Skip to content

Commit 6f1c83b

Browse files
docs(readme): add conflict caution to stack merge workflow section
Align with Vue repo — caution was lost when CLAUDE.md stack merge block was replaced by a pointer to README.
1 parent c54fcca commit 6f1c83b

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ git fetch devkit-node
163163
git merge devkit-node/master
164164
```
165165

166+
> Caution: resolve conflicts manually to preserve downstream customizations before pushing.
167+
166168
## :pencil2: Contribute
167169

168170
Open issues and pull requests on [GitHub](https://github.com/pierreb-devkit/Node).

0 commit comments

Comments
 (0)