Jenna's Runbooks
Jenna's Runbooks

Follow

Jenna's Runbooks

Follow
Resolve Git local changes to the following files would be overwritten

Photo by Yancy Min on Unsplash

Resolve Git local changes to the following files would be overwritten

Jenna's Runbooks's photo
Jenna's Runbooks
ยทFeb 10, 2023ยท

1 min read

I ran into a new conflict using git today that took a bit of wrangling ๐Ÿค 

"๐—ฌ๐—ผ๐˜‚๐—ฟ ๐—น๐—ผ๐—ฐ๐—ฎ๐—น ๐—ฐ๐—ต๐—ฎ๐—ป๐—ด๐—ฒ๐˜€ ๐˜๐—ผ ๐˜๐—ต๐—ฒ ๐—ณ๐—ผ๐—น๐—น๐—ผ๐˜„๐—ถ๐—ป๐—ด ๐—ณ๐—ถ๐—น๐—ฒ๐˜€ ๐˜„๐—ผ๐˜‚๐—น๐—ฑ ๐—ฏ๐—ฒ ๐—ผ๐˜ƒ๐—ฒ๐—ฟ๐˜„๐—ฟ๐—ถ๐˜๐˜๐—ฒ๐—ป ๐—ฏ๐˜† ๐—บ๐—ฒ๐—ฟ๐—ด๐—ฒ"

I didn't have any changes to commit locally, particularly not on the specified file, nor was anything stashed in my local branch. Despite this, Git continued to prevent me from pulling my latest commits to my master branch so that I could perform a rebase.

I tried the following to rectify this:

git pull
git pull --force
git pull origin --force
git stash pop
git stash
git stash drop
git merge --ff-only origin/master
git pull origin master
git reset HEAD

But none of these โฌ†๏ธ worked.

The solution for me was to:

git checkout path/to/file/to/revert
git reset HEAD path/to/file/to/revert
git pull

I was then able to switch back to my local branch, rebase the master branch, fix some conflicts and move on with my day ๐Ÿ˜Ž

Have you run into this particular scenario before? Any other suggested commands that worked for you?

ย 
Share this