diff --git a/apps/ui/src/components/DriveTools.vue b/apps/ui/src/components/DriveTools.vue
index bad9726c..ad815b5c 100644
--- a/apps/ui/src/components/DriveTools.vue
+++ b/apps/ui/src/components/DriveTools.vue
@@ -60,7 +60,7 @@ import {UiMixin} from './UiMixin.ts';
 import ToolButton from './ToolButton.vue';
 
 export default {
-  name: 'PreviewHeader',
+  name: 'DriveTools',
   mixins: [UtilsMixin, UiMixin],
   components: {ToolButton},
   props: {
diff --git a/apps/ui/src/components/GitFooter.vue b/apps/ui/src/components/GitFooter.vue
index e5f97086..d75c4c75 100644
--- a/apps/ui/src/components/GitFooter.vue
+++ b/apps/ui/src/components/GitFooter.vue
@@ -4,7 +4,7 @@
     <div class="card-body">
       <slot></slot>
       <button v-if="git_remote_url" type="button" class="btn btn-danger" @click="push"><i v-if="active_jobs.length > 0" class="fa-solid fa-rotate fa-spin"></i> Push</button>
-      <button v-if="git_remote_url" type="button" class="btn btn-secondary" @click="pull"><i v-if="active_jobs.length > 0" class="fa-solid fa-rotate fa-spin"></i> Pull</button>
+      <button v-if="git_remote_url" type="button" class="btn btn-secondary" @click="reset_pull"><i v-if="active_jobs.length > 0" class="fa-solid fa-rotate fa-spin"></i> Reset and Pull</button>
       <button v-if="git_remote_url" type="button" class="btn btn-secondary" @click="fetch"><i v-if="active_jobs.length > 0" class="fa-solid fa-rotate fa-spin"></i> Fetch</button>
       <span v-if="!git_remote_url">
         No git remote, go to <router-link :to="{ name: 'drive', params: { driveId }, hash: '#git_settings' }">settings</router-link>
@@ -41,6 +41,20 @@ export default {
         });
       });
     },
+    async reset_pull(event) {
+      await disableElement(event, async () => {
+        await this.authenticatedClient.fetchApi(`/api/git/${this.driveId}/reset_local`, {
+          method: 'post'
+        });
+        await this.authenticatedClient.fetchApi(`/api/git/${this.driveId}/pull`, {
+          method: 'post',
+          headers: {
+            'Content-type': 'application/json'
+          },
+          body: JSON.stringify({})
+        });
+      });
+    },
     async pull(event) {
       await disableElement(event, async () => {
         await this.authenticatedClient.fetchApi(`/api/git/${this.driveId}/pull`, {
diff --git a/apps/ui/src/components/GitSideBar.vue b/apps/ui/src/components/GitSideBar.vue
index 71ed6a10..8bed5d0b 100644
--- a/apps/ui/src/components/GitSideBar.vue
+++ b/apps/ui/src/components/GitSideBar.vue
@@ -29,6 +29,7 @@
       <div class="dropdown" v-if="slotProps.ctx">
         <ul class="dropdown-menu show">
           <li><button class="dropdown-item" type="button" @click="removeFile(slotProps.ctx)"><i class="fa-solid fa-trash"></i> Remove</button></li>
+          <li><button class="dropdown-item" type="button" @click="removeFileCached(slotProps.ctx)"><i class="fa-solid fa-trash"></i> Remove from git</button></li>
         </ul>
       </div>
     </template>
@@ -37,6 +38,7 @@
 <script>
 import GitSideBarRow from './GitSideBarRow.vue';
 import ContextMenu from './ContextMenu.vue';
+import {UtilsMixin} from './UtilsMixin.ts';
 
 export default {
   components: {
@@ -48,6 +50,7 @@ export default {
     checked: Object,
     selectedPath: String
   },
+  mixins: [ UtilsMixin ],
   data() {
     return {
       tree: [],
@@ -119,6 +122,21 @@ export default {
       await this.FileClientService.removeFile('/' + this.driveId + (path.startsWith('/') ? path : '/' + path));
       this.$refs.contextMenu.close();
     },
+    async removeFileCached(file) {
+      if (!window.confirm('Are you sure?')) {
+        this.$refs.contextMenu.close();
+        return;
+      }
+      const filePath = file.path;
+      await this.authenticatedClient.fetchApi(`/api/git/${this.driveId}/remove_cached`, {
+        method: 'post',
+        headers: {
+          'Content-type': 'application/json'
+        },
+        body: JSON.stringify({ filePath })
+      });
+      this.$refs.contextMenu.close();
+    },
     showContextMenu(event, ctx) {
       this.$refs.contextMenu.open(event, ctx);
     },
diff --git a/apps/ui/src/pages/FolderView.vue b/apps/ui/src/pages/FolderView.vue
index 6e6601ce..a5470c17 100644
--- a/apps/ui/src/pages/FolderView.vue
+++ b/apps/ui/src/pages/FolderView.vue
@@ -78,9 +78,9 @@
               </template>
             </GitSettings>
 
-            <UserSettings v-if="!contentDir && !(activeTab === 'drive_config' || activeTab === 'drive_config_git')" :activeTab="activeTab">
+            <UserSettings v-if="!(activeTab === 'drive_config' || activeTab === 'drive_config_git')" :activeTab="activeTab">
               <template v-slot:header>
-                <div class="card-header alert-danger">
+                <div class="card-header alert-danger" v-if="!contentDir">
                   Content subdirectory must be set and start with /
                 </div>
               </template>
diff --git a/src/containers/action/ActionRunnerContainer.ts b/src/containers/action/ActionRunnerContainer.ts
index 5f332b4d..f9346b32 100644
--- a/src/containers/action/ActionRunnerContainer.ts
+++ b/src/containers/action/ActionRunnerContainer.ts
@@ -364,7 +364,7 @@ export class ActionRunnerContainer extends Container {
 
   private payloadToEnv() {
     const additionalEnv = {};
-    additionalEnv['REMOTE_BRANCH'] = this.userConfigService.config?.remote_branch || 'master';
+    additionalEnv['REMOTE_BRANCH'] = this.userConfigService.config?.remote_branch || 'main';
 
     if (this.params.payload && this.params.payload.startsWith('{')) {
       try {
diff --git a/src/containers/changes/WatchChangesContainer.ts b/src/containers/changes/WatchChangesContainer.ts
index 3a678742..bc365855 100644
--- a/src/containers/changes/WatchChangesContainer.ts
+++ b/src/containers/changes/WatchChangesContainer.ts
@@ -114,6 +114,9 @@ export class WatchChangesContainer extends Container {
       return;
     }
     this.intervals[driveId] = setInterval(async () => {
+      if (!this.auth) {
+        return;
+      }
       if (this.working[driveId]) {
         return;
       }
diff --git a/src/containers/folder_registry/FolderRegistryContainer.ts b/src/containers/folder_registry/FolderRegistryContainer.ts
index 0354bba2..1412327d 100644
--- a/src/containers/folder_registry/FolderRegistryContainer.ts
+++ b/src/containers/folder_registry/FolderRegistryContainer.ts
@@ -62,21 +62,29 @@ export class FolderRegistryContainer extends Container {
     const oldDrives = Object.values(await this.getFolders());
 
     const apiContainer: GoogleApiContainer = <GoogleApiContainer>this.engine.getContainer('google_api');
-    const drives = await apiContainer.listDrives();
-
-    for (const newDrive of drives) {
-      if (!oldDrives.find(oldDrive => oldDrive.id === newDrive.id)) {
-        try {
-          await this.registerFolder(newDrive.id);
-        } catch (err) {
-          this.logger.error(err.stack ? err.stack : err.message);
+    try {
+      const drives = await apiContainer.listDrives();
+
+      for (const newDrive of drives) {
+        if (!oldDrives.find(oldDrive => oldDrive.id === newDrive.id)) {
+          try {
+            await this.registerFolder(newDrive.id);
+          } catch (err) {
+            this.logger.error(err.stack ? err.stack : err.message);
+          }
         }
       }
-    }
-    for (const oldDrive of oldDrives) {
-      if (!drives.find(newDrive => newDrive.id === oldDrive.id)) {
-        await this.unregisterFolder(oldDrive.id);
+      for (const oldDrive of oldDrives) {
+        if (!drives.find(newDrive => newDrive.id === oldDrive.id)) {
+          await this.unregisterFolder(oldDrive.id);
+        }
+      }
+    } catch (err) {
+      if (401 === err?.status) {
+        this.logger.warn('Not authenticated to Google API. Skipping drives refresh.');
+        return;
       }
+      throw err;
     }
   }
 
diff --git a/src/containers/google_api/GoogleApiContainer.ts b/src/containers/google_api/GoogleApiContainer.ts
index 1718606d..3e6b0f2e 100644
--- a/src/containers/google_api/GoogleApiContainer.ts
+++ b/src/containers/google_api/GoogleApiContainer.ts
@@ -10,6 +10,7 @@ import {GoogleFile} from '../../model/GoogleFile.ts';
 import {GoogleAuth, HasAccessToken, UserAuthClient, ServiceAuthClient, getCliCode} from '../../google/AuthClient.ts';
 
 import {fileURLToPath} from 'url';
+import {AuthError} from '../server/auth.ts';
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -70,23 +71,39 @@ export class GoogleApiContainer extends Container {
   }
 
   async listDrives(): Promise<Drive[]> {
+    if (!this.auth) {
+      throw new AuthError('Not authenticated', 401);
+    }
+
     const googleDriveService = new GoogleDriveService(this.logger, this.quotaLimiter);
     const accessToken = await this.auth.getAccessToken();
     return await googleDriveService.listDrives(accessToken);
   }
 
   async getDrive(driveId: FileId): Promise<Drive> {
+    if (!this.auth) {
+      throw new AuthError('Not authenticated', 401);
+    }
+
     const googleDriveService = new GoogleDriveService(this.logger, this.quotaLimiter);
     const accessToken = await this.auth.getAccessToken();
     return await googleDriveService.getDrive(accessToken, driveId);
   }
 
   async getFolder(fileId: FileId): Promise<GoogleFile> {
+    if (!this.auth) {
+      throw new AuthError('Not authenticated', 401);
+    }
+
     const googleDriveService = new GoogleDriveService(this.logger, this.quotaLimiter);
     return await googleDriveService.getFile(this.auth, fileId);
   }
 
   async shareDrive(driveId: string, shareEmail: string): Promise<Permission> {
+    if (!this.auth) {
+      throw new AuthError('Not authenticated', 401);
+    }
+
     const googleDriveService = new GoogleDriveService(this.logger, this.quotaLimiter);
     const accessToken = await this.auth.getAccessToken();
     return await googleDriveService.shareDrive(accessToken, driveId, shareEmail);
diff --git a/src/containers/google_folder/UserConfigService.ts b/src/containers/google_folder/UserConfigService.ts
index fc15fde2..67234f3f 100644
--- a/src/containers/google_folder/UserConfigService.ts
+++ b/src/containers/google_folder/UserConfigService.ts
@@ -46,7 +46,7 @@ export class UserConfig {
 }
 
 const DEFAULT_CONFIG: UserConfig = {
-  remote_branch: 'master',
+  remote_branch: 'main',
   hugo_theme: {
     id: 'ananke',
     name: 'Anake',
diff --git a/src/containers/server/auth.ts b/src/containers/server/auth.ts
index 1edb03cd..cf2c63e7 100644
--- a/src/containers/server/auth.ts
+++ b/src/containers/server/auth.ts
@@ -61,24 +61,24 @@ interface JwtDecryptedPayload extends GoogleUser {
   driveId: string;
 }
 
-export function signToken(payload: JwtDecryptedPayload): string {
-  const expiresIn = 365 * 24 * 3600; // process.env.JWT_ACCESS_TOKEN_EXPIRATION_TIME ||
+function signToken(payload: JwtDecryptedPayload, jwtSecret: string): string {
+  const expiresIn = 365 * 24 * 3600;
 
   const encrypted: JwtEncryptedPayload = {
     sub: payload.id,
     name: payload.name,
     email: payload.email,
-    gat: encrypt(payload.google_access_token, process.env.JWT_SECRET),
-    grt: payload.google_refresh_token ? encrypt(payload.google_refresh_token, process.env.JWT_SECRET) : undefined,
+    gat: encrypt(payload.google_access_token, jwtSecret),
+    grt: payload.google_refresh_token ? encrypt(payload.google_refresh_token, jwtSecret) : undefined,
     ged: payload.google_expiry_date,
     driveId: payload.driveId
   };
 
-  return jsonwebtoken.sign(encrypted, process.env.JWT_SECRET, { expiresIn });
+  return jsonwebtoken.sign(encrypted, jwtSecret, { expiresIn });
 }
 
-export function verifyToken(accessCookie: string): JwtDecryptedPayload {
-  const encrypted: JwtEncryptedPayload = <JwtEncryptedPayload>jsonwebtoken.verify(accessCookie, process.env.JWT_SECRET);
+function verifyToken(accessCookie: string, jwtSecret: string): JwtDecryptedPayload {
+  const encrypted: JwtEncryptedPayload = <JwtEncryptedPayload>jsonwebtoken.verify(accessCookie, jwtSecret);
 
   return {
     id: encrypted.sub,
@@ -240,6 +240,8 @@ export async function getAuth(req: Request, res: Response, next) {
     const googleDriveService = new GoogleDriveService(this.logger, null);
     const googleUser: GoogleUser = await authClient.getUser(await authClient.getAccessToken());
 
+    const jwtSecret = process.env.JWT_SECRET;
+
     if (driveId) {
       const drive = await googleDriveService.getDrive(await authClient.getAccessToken(), driveId);
       if (drive.id) {
@@ -247,7 +249,7 @@ export async function getAuth(req: Request, res: Response, next) {
           ...googleUser,
           ...await authClient.getAuthData(),
           driveId: driveId
-        });
+        }, jwtSecret);
         setAccessCookie(res, accessToken);
         res.redirect(redirectTo || '/');
         return;
@@ -257,7 +259,7 @@ export async function getAuth(req: Request, res: Response, next) {
         ...googleUser,
         ...await authClient.getAuthData(),
         driveId: driveId
-      });
+      }, jwtSecret);
       setAccessCookie(res, accessToken);
       res.redirect(redirectTo || '/drive');
       return;
@@ -289,8 +291,10 @@ async function decodeAuthenticateInfo(req, res, next) {
     return;
   }
 
+  const jwtSecret = process.env.JWT_SECRET;
+
   try {
-    const decoded = verifyToken(req.cookies.accessToken);
+    const decoded = verifyToken(req.cookies.accessToken, jwtSecret);
     if (!decoded.id) {
       return next(redirError(req, 'No jwt.sub'));
     }
@@ -319,7 +323,7 @@ async function decodeAuthenticateInfo(req, res, next) {
         ...decoded,
         ...await authClient.getAuthData(),
         driveId: driveId
-      });
+      }, jwtSecret);
       setAccessCookie(res, accessToken);
     }
 
diff --git a/src/containers/server/routes/ConfigController.ts b/src/containers/server/routes/ConfigController.ts
index 5d8d09fa..5ad87618 100644
--- a/src/containers/server/routes/ConfigController.ts
+++ b/src/containers/server/routes/ConfigController.ts
@@ -86,7 +86,7 @@ export class ConfigController extends Controller {
     await userConfigService.load();
 
     if (body.config?.remote_branch) {
-      userConfigService.config.remote_branch = body.config?.remote_branch || 'master';
+      userConfigService.config.remote_branch = body.config?.remote_branch || 'main';
     }
     if (body.config?.hugo_theme) {
       userConfigService.config.hugo_theme = body.config?.hugo_theme;
diff --git a/src/containers/server/routes/GitController.ts b/src/containers/server/routes/GitController.ts
index 39b1cb10..ba059e05 100644
--- a/src/containers/server/routes/GitController.ts
+++ b/src/containers/server/routes/GitController.ts
@@ -15,6 +15,10 @@ interface CmdPost {
   cmd: string;
 }
 
+interface RemovePath {
+  filePath: string;
+}
+
 export default class GitController extends Controller {
 
   constructor(subPath: string, private readonly filesService: FileContentService,
@@ -166,4 +170,22 @@ export default class GitController extends Controller {
     }
   }
 
+  @RoutePost('/:driveId/remove_cached')
+  async removeCached(@RouteParamPath('driveId') driveId: string, @RouteParamBody() body: RemovePath) {
+    try {
+      const transformedFileSystem = await this.filesService.getSubFileService(driveId + '_transform', '');
+      const gitScanner = new GitScanner(this.logger, transformedFileSystem.getRealPath(), 'wikigdrive@wikigdrive.com');
+      await gitScanner.initialize();
+      await gitScanner.removeCached(body.filePath);
+
+      return {};
+    } catch (err) {
+      this.logger.error(err.stack ? err.stack : err.message);
+      if (err.message.indexOf('Failed to retrieve list of SSH authentication methods') > -1) {
+        return { error: 'Failed to authenticate' };
+      }
+      throw err;
+    }
+  }
+
 }
diff --git a/src/git/GitScanner.ts b/src/git/GitScanner.ts
index cefef44d..653cef0a 100644
--- a/src/git/GitScanner.ts
+++ b/src/git/GitScanner.ts
@@ -188,7 +188,13 @@ export class GitScanner {
       const chunk = removedFiles.splice(0, 400);
       const rmParam = chunk.map(fileName => `"${sanitize(fileName)}"`).join(' ');
       if (rmParam) {
-        await this.exec(`git rm -r ${rmParam}`);
+        try {
+          await this.exec(`git rm -r ${rmParam}`);
+        } catch (err) {
+          if (err.message.indexOf('did not match any files') === -1) {
+            throw err;
+          }
+        }
       }
     }
 
@@ -208,11 +214,20 @@ export class GitScanner {
 
   async pullBranch(remoteBranch: string, sshParams?: SshParams) {
     if (!remoteBranch) {
-      remoteBranch = 'master';
+      remoteBranch = 'main';
     }
 
-    await this.exec(`git pull --autostash --rebase origin ${remoteBranch}:master`, {
+    const committer = {
+      name: 'WikiGDrive',
+      email: this.email
+    };
+
+    await this.exec(`git pull --rebase origin ${remoteBranch}`, {
       env: {
+        GIT_AUTHOR_NAME: committer.name,
+        GIT_AUTHOR_EMAIL: committer.email,
+        GIT_COMMITTER_NAME: committer.name,
+        GIT_COMMITTER_EMAIL: committer.email,
         GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
       }
     });
@@ -230,12 +245,12 @@ export class GitScanner {
     await this.exec(`git clone ${this.rootPath} ${dir}`, { skipLogger: true });
   }
 
-  async pushBranch(remoteBranch: string, sshParams?: SshParams, localBranch = 'master') {
+  async pushBranch(remoteBranch: string, sshParams?: SshParams, localBranch = 'main') {
     if (!remoteBranch) {
-      remoteBranch = 'master';
+      remoteBranch = 'main';
     }
 
-    if (localBranch !== 'master') {
+    if (localBranch !== 'main') {
       await this.exec(`git push --force origin ${localBranch}:${remoteBranch}`, {
         env: {
           GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
@@ -250,7 +265,7 @@ export class GitScanner {
     };
 
     try {
-      await this.exec(`git push origin master:${remoteBranch}`, {
+      await this.exec(`git push origin main:${remoteBranch}`, {
         env: {
           GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
         }
@@ -281,7 +296,7 @@ export class GitScanner {
           throw err;
         }
 
-        await this.exec(`git push origin master:${remoteBranch}`, {
+        await this.exec(`git push origin main:${remoteBranch}`, {
           env: {
             GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
           }
@@ -294,7 +309,10 @@ export class GitScanner {
   }
 
   async resetToLocal(sshParams?: SshParams) {
-    await this.exec('git checkout master --force', {});
+    await this.exec('git checkout main --force', {});
+    try {
+      await this.exec('git rebase --abort', {});
+    } catch (ignoredError) { /* empty */ }
     await this.exec('git reset --hard HEAD', {
       env: {
         GIT_SSH_COMMAND: sshParams?.privateKeyFile ? `ssh -i ${sanitize(sshParams.privateKeyFile)} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes` : undefined
@@ -305,7 +323,7 @@ export class GitScanner {
 
   async resetToRemote(remoteBranch: string, sshParams?: SshParams) {
     if (!remoteBranch) {
-      remoteBranch = 'master';
+      remoteBranch = 'main';
     }
 
     await this.exec('git fetch origin', {
@@ -600,7 +618,7 @@ export class GitScanner {
     }
 
     if (!await this.isRepo()) {
-      await this.exec('git init -b master', { skipLogger: true });
+      await this.exec('git init -b main', { skipLogger: true });
     }
   }
 
@@ -881,7 +899,7 @@ export class GitScanner {
   }
 
   async cmd(cmd: string) {
-    if (!['status', 'remote -v'].includes(cmd)) {
+    if (!['status', 'remote -v', 'ls-files --stage'].includes(cmd)) {
       throw new Error('Forbidden command');
     }
 
@@ -889,4 +907,8 @@ export class GitScanner {
 
     return { stdout: result.stdout, stderr: result.stderr };
   }
+
+  async removeCached(filePath: string) {
+    await this.exec(`git rm --cached ${filePath}`);
+  }
 }
diff --git a/test/git/GitTest.ts b/test/git/GitTest.ts
index 82330383..298d7f21 100644
--- a/test/git/GitTest.ts
+++ b/test/git/GitTest.ts
@@ -295,9 +295,8 @@ describe('GitTest', function () {
       const scannerLocal = new GitScanner(logger, localRepoDir, COMMITER1.email);
       await scannerLocal.initialize();
 
-      fs.writeFileSync(path.join(localRepoDir, 'file1.md'), 'Initial content');
-
       {
+        fs.writeFileSync(path.join(localRepoDir, 'file1.md'), 'Initial content');
         const changes = await scannerLocal.changes();
         assert.equal(2, (await scannerLocal.changes()).length);
         await scannerLocal.commit('First commit', changes.map(change => change.path), [], COMMITER1);
@@ -313,13 +312,71 @@ describe('GitTest', function () {
 
       const scannerSecond = new GitScanner(logger, secondRepoDir, COMMITER2.email);
       await scannerSecond.initialize();
-      fs.unlinkSync(secondRepoDir + '/.gitignore');
       await scannerSecond.setRemoteUrl(githubRepoDir);
-      await scannerSecond.pullBranch('main');
+
+      // fs.mkdirSync(path.join(secondRepoDir, 'content'));
+      // fs.writeFileSync(path.join(secondRepoDir, '_errors.md'), '---\ntype: \'page\'\n---\nChange local');
+
+      await scannerSecond.resetToRemote('main');
+      // await scannerSecond.pullBranch('main');
 
       const history = await scannerSecond.history('/');
       assert.equal(history.length, 1);
       assert.equal(history[0].author_name, 'John <john@example.tld>');
+
+      {
+        fs.writeFileSync(path.join(localRepoDir, 'file2.md'), 'Second change');
+        const changes = await scannerLocal.changes();
+        assert.equal(1, (await scannerLocal.changes()).length);
+        await scannerLocal.commit('Second commit', changes.map(change => change.path), [], COMMITER2);
+      }
+
+      await scannerLocal.pushBranch('main');
+
+      {
+        // fs.writeFileSync(path.join(localRepoDir, '_errors1.md'), 'Change local');
+        // const changes = await scannerLocal.changes();
+        // assert.equal(1, (await scannerLocal.changes()).length);
+        // await scannerLocal.commit('Local commit', changes.map(change => change.path), [], COMMITER1);
+      }
+
+      const fd = fs.openSync(path.join(secondRepoDir, '_errors.md'), 'w');
+      // fs.writeSync(fd, '');
+
+      // fs.writeFileSync(path.join(secondRepoDir, '_errors.md'), '');
+      // await scannerSecond.cmd('add -N _errors.md');
+      // fs.chmodSync(path.join(secondRepoDir, '_errors.md'), 0o771);
+
+
+      await scannerSecond.autoCommit();
+
+      console.info(await scannerSecond.cmd('ls-files --stage'));
+
+      fs.writeSync(fd, 'test');
+      // fs.closeSync(fd);
+
+      console.info(await scannerSecond.cmd('ls-files --stage'));
+
+      // fs.unlinkSync(path.join(secondRepoDir, '_errors.md'));
+      // fs.writeFileSync(path.join(secondRepoDir, '_errors.md'), '---\ntype: \'page\'\n---\nChange local');
+
+      // await scannerSecond.autoCommit();
+
+      // fs.writeFileSync(path.join(secondRepoDir, 'untracked.md'), 'untracked');
+
+      console.info(await scannerSecond.cmd('ls-files --stage'));
+
+      await scannerSecond.resetToLocal();
+      await scannerSecond.pullBranch('main');
+
+      console.info(await scannerSecond.cmd('status'));
+
+      {
+        const history = await scannerSecond.history('/');
+        assert.equal(history.length, 2);
+        assert.equal(history[0].author_name, 'Bob <bob@example.tld>');
+        assert.equal(history[1].author_name, 'John <john@example.tld>');
+      }
     } finally {
       fs.rmSync(localRepoDir, { recursive: true, force: true });
       fs.rmSync(githubRepoDir, { recursive: true, force: true });
@@ -484,7 +541,7 @@ describe('GitTest', function () {
       await scannerLocal.commit('Third commit', ['file1.md'], [], COMMITER1);
 
       const headCommit = await scannerLocal.getBranchCommit('HEAD');
-      const masterCommit = await scannerLocal.getBranchCommit('master');
+      const masterCommit = await scannerLocal.getBranchCommit('main');
       const remoteCommit = await scannerLocal.getBranchCommit('refs/remotes/origin/main');
       const remoteCommit2 = await scannerSecond.getBranchCommit('HEAD');
 
diff --git a/test/git/RebaseTest.ts b/test/git/RebaseTest.ts
index a09e79b4..73346b21 100644
--- a/test/git/RebaseTest.ts
+++ b/test/git/RebaseTest.ts
@@ -1,11 +1,12 @@
-import {GitScanner} from '../../src/git/GitScanner';
-import winston from 'winston';
-import {createTmpDir} from '../utils';
 import fs from 'fs';
 import path from 'path';
-import {assert} from 'chai';
 import {execSync} from 'child_process';
-import {instrumentLogger} from '../../src/utils/logger/logger';
+import winston from 'winston';
+import {assert} from 'chai';
+
+import {GitScanner} from '../../src/git/GitScanner.ts';
+import {createTmpDir} from '../utils.ts';
+import {instrumentLogger} from '../../src/utils/logger/logger.ts';
 
 const COMMITER1 = {
   name: 'John', email: 'john@example.tld'
@@ -71,7 +72,7 @@ describe('RebaseTest', function () {
       }
 
       const headCommit = await scannerLocal.getBranchCommit('HEAD');
-      const masterCommit = await scannerLocal.getBranchCommit('master');
+      const masterCommit = await scannerLocal.getBranchCommit('main');
       const remoteCommit = await scannerLocal.getBranchCommit('refs/remotes/origin/main');
       assert.equal(headCommit, masterCommit);
       assert.equal(headCommit, remoteCommit);
@@ -140,7 +141,7 @@ describe('RebaseTest', function () {
       }
 
       const headCommit = await scannerLocal.getBranchCommit('HEAD');
-      const masterCommit = await scannerLocal.getBranchCommit('master');
+      const masterCommit = await scannerLocal.getBranchCommit('main');
       const remoteCommit = await scannerLocal.getBranchCommit('refs/remotes/origin/main');
       assert.equal(headCommit, masterCommit);
       assert.equal(headCommit, remoteCommit);
@@ -206,7 +207,7 @@ describe('RebaseTest', function () {
       }
 
       const headCommit = await scannerSecond.getBranchCommit('HEAD');
-      const masterCommit = await scannerSecond.getBranchCommit('master');
+      const masterCommit = await scannerSecond.getBranchCommit('main');
       const remoteCommit = await scannerSecond.getBranchCommit('refs/remotes/origin/main');
       assert.equal(headCommit, masterCommit);
       assert.equal(headCommit, remoteCommit);
@@ -298,7 +299,7 @@ describe('RebaseTest', function () {
       }
 
       const headCommit = await scannerSecond.getBranchCommit('HEAD');
-      const masterCommit = await scannerSecond.getBranchCommit('master');
+      const masterCommit = await scannerSecond.getBranchCommit('main');
       const remoteCommit = await scannerSecond.getBranchCommit('refs/remotes/origin/main');
       assert.equal(headCommit, masterCommit);
       assert.equal(headCommit, remoteCommit);
@@ -373,7 +374,7 @@ describe('RebaseTest', function () {
 
       {
         const headCommit = await scannerLocal.getBranchCommit('HEAD');
-        const masterCommit = await scannerLocal.getBranchCommit('master');
+        const masterCommit = await scannerLocal.getBranchCommit('main');
         const remoteCommit = await scannerLocal.getBranchCommit('refs/remotes/origin/main');
         assert.equal(headCommit, masterCommit);
         assert.equal(headCommit, remoteCommit);
@@ -393,7 +394,7 @@ describe('RebaseTest', function () {
       }
 
       const headCommit = await scannerSecond.getBranchCommit('HEAD');
-      const masterCommit = await scannerSecond.getBranchCommit('master');
+      const masterCommit = await scannerSecond.getBranchCommit('main');
       const remoteCommit = await scannerSecond.getBranchCommit('refs/remotes/origin/main');
       assert.equal(headCommit, masterCommit);
       assert.equal(headCommit, remoteCommit);