nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Cannot pull with rebase: You have unstaged changes.

unknown

I highly doubt that this is a SourceTree issue, but the colleague who is reporting this issue is using SourceTree installed git and I can't find any answers anwhere else, so I thought I'd try the experts here. The guy is trying to do a simple pull. What he gets, in several different repositories is:

Cannot pull with rebase: You have unstaged changes.

Doing a git status reports that:

# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 1 different commit each, respectively.
#
nothing to commit (working directory clean)

Doing a git reset --hard makes no difference.

There is no output from any of this either:

git update-index -q --ignore-submodules --refresh
git diff-files --ignore-submodules
git diff-index --cached --ignore-submodules HEAD --

Sometimes, but not every time, I can do a git pull --no-rebase and it will work, but that's a workaround (and not even a consistent one).

Has anyone ever seen anthing like this? This has been going on for several months and I'm at a complete loss. Something is very wrong, but I have absolutely no idea what.

Accepted answers

unknown

Unfortunately, I was never able to find an "in-place" solution for this issue. I ended up re-cloning the repository locally (it had previously been accessed on a networked Linux machine via Samba) and creating a Vagrant dev environment.

So far, no issues.

All comments

KieranA

Hey Rob,

Have you tried doing

git fetch
git rebase -p origin/master

That may work in your case, although you may have already tried that.

unknown

We pull via rebase by default so, if I remember my flags correctly, I've effectively tried this. The only new component is the fetch which I've tried. What I can't figure out is just what Git thinks has changed. I haven't found any way to get it to tell me.

Thanks.

KieranA

Next step would be to check your .gitattributes (in the repo) and .gitconfig for any weird line ending conversion settings that may be wrong. Also, if you're mixing git versions (embedded and system) then this could cause problems.

unknown

No .gitattributes in this particular repository so there shouldn't be anything funky going on there. I do have filemode set to false, but I've never had that be an actual problem. If I turn it on, git status reports changes. Turn it off and it doesn't. Pretty much exactly what I'd expect.

I'll take a look at the guy's text config setting, but it still seems like git status should report a change if one was made. In this case, git seems to be talking out of both sides of its, ahem, mouth. No changes, says git status, but yet changes are preventing a pull. **confused**

Thanks for your help.

unknown

So far, no issues.

KieranA

Were you using a mounted network drive in this instance? It's known to be very problematic when it comes to Git/Hg.

KieranA

Yeah if you use a mounted network location as your repo location you will most likely encounter problems. This isn't something we support as we have no control over it. Typically we suggest cloning locally because it's so problematic. Your error does seem strange in this case, but what generally happens is that your repository gets corrupted. I'd suggest your solution is the correct one. Many people want to be able to do this, but it's a limitation of a NFS, really.

unknown

Thank, Kieran. It's helpful to understand the "why" behind the error.

Tomasz B

Hi,

I had the same problem. In my case I fixed it by adding noatime to the mount command for nfs share I was working on.

mount -t nfs -o noatime,... device destination

Jaxmetalmax

In the workflow you first commit any change and then rebase, if you don't want to commit the changes you can stash, then rebase, and then pop stash, this problem happened to me using tortoisegit as well, this is not a sourcetree problem, or a problem with the network drive.

Henrik_vadeol

A coworker is experiencing this once or twice a day on his Windows machine. He runs git under cygwin, and the repo is locally on his C: drive.