Github for Windows puts the repo in a "reload" state but says "Couldn't sync this branch"

Sometimes when I click a button Sync

on Github for Windows, it tells me:

Failed to sync this branch
You might need to open a shell and debug the state of this repo

      

Then go to your console and type git status

. Most of the time it does this, git status

it tells me the following information:

> git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently rebasing.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working directory clean

      

If I understand correctly, then:

  • Github for Windows started a Rebase operation but failed for some reason.
  • The working copy is clean. There are no files that Sync can overwrite, and there are no conflicts.
  • Git tells me to continue the reinstall operation after all conflicts have been resolved (although there are no conflicts in this case).

> git rebase --continue

Stray path/to/repo/.git/rebase-apply directory found.

Use "git am --abort" to remove it.

I'm doing it:

> git am --abort

      

Thereafter, the Rebase operation is complete / aborted, and clicking the Github for Windows sync button again successfully pushes the commits.

I'm just wondering, if there are no conflicts, why is sync failing in the first place?

+3


source to share


2 answers


I am one of the developers on GitHub for Windows.

A log file appears that GitHub for Windows generates to help you understand what was happening during the sync:



https://help.github.com/articles/accessing-the-github-for-windows-log

I would love to know why the overflow is happening, because it looks like the whole thing should end up judging on other details ...

+5


source


Sync op error in the first place?



Because the GUI doesn't want it to complete the reboot completely and wants to make sure the user is aware of this error.

+1


source







All Articles