Sergio Padrino
Sergio Padrino
Hmmm weird, I don't see how this is a GitHub Desktop specific error. What happens if, at step (3), you enter `git pull` from the terminal instead of pulling from...
@ImRodry can you run `git status` in that state and share a screenshot of both the terminal and GitHub Desktop? I'm curious about whether Desktop is reflecting the same state...
Thank you!! I still wonder what does GitHub Desktop show in step (3). Could you do this? 1. Create a merge conflict in your working repository. This can easily be...
Yeah in that case GitHub Desktop is not adding it to the stage, so you can't pull, you must commit the change first (or stash it again) before pulling. In...
I don't think it's a bug at all: - On the git side, you can either `git add` or `git reset` to solve the conflicts or clear the changes, and...
That's because GitHub Desktop is kind of disconnected from what `git` sees, in order to be able to abstract some git stuff and try to make the experience simpler to...
Another report in #14467
Hi everyone! 👋 Thanks to @axsms who referred to this issue in #16593 we became aware of it (sorry we somehow missed it in the past). We agree this is...
@Benjy1979 could you run `git -c credential.helper= fetch --progress --prune --recurse-submodules=on-demand origin` or `git -c credential.helper= -c rebase.backend=merge pull --ff --recurse-submodules --progress origin` in that repository? I wonder if those...
> That is a big repo with lots of files though This is probably the reason, then :( You can also see here Desktop is having trouble to process the...