git: intent-to-add breaks autostash 0 ▲ ¬ just serendipity 🍀 50 minutes ago · Tech · hide · 0 comments ♠ Problem statement: git pull could not autostash files added with git add -N. I had local work and was nine commits behind origin/master: % git pull --force Updating 266a5af537..07e4551075 error: Entry 'ci/goodreads_to_reading.py' not uptodate. Cannot merge. Cannot save the current worktree state fatal: Cannot autostash --force does not replace local worktree files. My global Git configuration makes git pull run rebase.autostash, which found an intent-to-add entry: % git status --porcelain=v2 1 .M N... 100755 100755 100755 fcc319233ddf8e000ad2f735dbc2b0d760f467e5 fcc319233ddf8e000ad2f735dbc2b0d760f467e5 Justfile 1 .A N... 000000 000000 100755 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 ci/goodreads_to_reading.py 1 .M N... 100644 100644 100644 2787100c3968766ea3a84e7c28e28b5046d1da32 2787100c3968766ea3a84e7c28e28b5046d1da32 config/_default/config.yml 1 .A N... 000000 000000 100644 0000000000000000000000000000000000000000… No comments yet. Log in to reply on the Fediverse. Comments will appear here.