docs(changeset):

Author: mayank1513

.changeset/tame-pumas-drop.md

@@ -0,0 +1,2 @@
+---
+---

lib/src/index.ts

@@ -13,19 +13,17 @@ export const resolveConflicts = async <T extends string = InbuiltMergeStrategies
   const globalLogger = await createLogger(config.loggerConfig);
   const normalizedConfig: NormalizedConfig = await normalizeConfig<T>(config);
   const filesEntries = await listMatchingFiles(normalizedConfig);
-  if (normalizedConfig.debug) {
-    globalLogger.info("all", JSON.stringify({ normalizedConfig, filesEntries }, null, 2));
-  }
   await Promise.all(
     filesEntries.map(async ({ filePath, content }) => {
-      const { theirs, ours, format } = await parseConflictContent(content, {
+      const { theirs, ours, base, format } = await parseConflictContent(content, {
         filename: filePath,
         parsers: normalizedConfig.parsers,
       });
+      globalLogger.debug(filePath, JSON.stringify({ ours, theirs, base, format }));
       await processMerge({
         ours,
         theirs,
-        base: undefined,
+        base,
         format,
         filePath,
         config,

lib/src/logger.ts

@@ -9,13 +9,14 @@ interface LogEntry {
   message: string;
 }
 
-export const createLogger = async (config: LoggerConfig = {}) => {
+export const createLogger = async (config: LoggerConfig = {}, debug?: boolean) => {
   const mode: Mode = config.mode ?? "memory";
   const logDir = config.logDir ?? ".logs";
   const singleFile = config.singleFile ?? false;
   const levels = {
-    stdout: config.levels?.stdout ?? ["warn", "error"],
-    file: config.levels?.file ?? ["info", "warn", "error"],
+    stdout:
+      config.levels?.stdout ?? (debug ? ["debug", "info", "warn", "error"] : ["warn", "error"]),
+    file: config.levels?.file ?? (debug ? ["info", "debug", "warn", "error"] : ["error"]),
   };
 
   // Async directory creation

lib/src/utils.ts

@@ -152,7 +152,7 @@ export const createSkipDirectoryMatcher = (
   };
 };
 
-export const backupFile = async (filePath: string, backupDir: string) => {
+export const backupFile = async (filePath: string, backupDir = DEFAULT_BACKUP_DIR) => {
   const relPath = path.relative(process.cwd(), filePath);
   const backupPath = path.join(backupDir, relPath);