@postxl/generator 1.3.1 → 1.3.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/dist/utils/sync.js +6 -1
- package/package.json +1 -1
package/dist/utils/sync.js
CHANGED
|
@@ -154,6 +154,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
|
|
|
154
154
|
await Promise.all(tasks);
|
|
155
155
|
return { success: true, ...result };
|
|
156
156
|
}
|
|
157
|
+
const validFilesWithMergeConflictMarkers = new Set([
|
|
158
|
+
'/CLAUDE.md', // Contains instructions for resolving merge conflicts
|
|
159
|
+
]);
|
|
157
160
|
/**
|
|
158
161
|
* Finds all files in the disk that contain unresolved merge conflict markers.
|
|
159
162
|
*
|
|
@@ -163,7 +166,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
|
|
|
163
166
|
function findFilesWithMergeConflicts(files) {
|
|
164
167
|
const filesWithConflicts = [];
|
|
165
168
|
for (const [filePath, { disk }] of files) {
|
|
166
|
-
if (disk.state === 'hash' &&
|
|
169
|
+
if (disk.state === 'hash' &&
|
|
170
|
+
(0, merge_conflict_1.hasMergeConflictMarkers)(disk.content) &&
|
|
171
|
+
!validFilesWithMergeConflictMarkers.has(filePath)) {
|
|
167
172
|
filesWithConflicts.push(filePath);
|
|
168
173
|
}
|
|
169
174
|
}
|