git sync failed

[neilmiddleton]

No real idea as to why but the trace is here:

Pushing commits to the server.
Restoring local changes.
Traceback (most recent call last):
File "/usr/local/bin/legit", line 9, in
load_entry_point('legit==0.1.1', 'console_scripts', 'legit')()
File "/Library/Python/2.7/site-packages/legit/cli.py", line 45, in main
cmd_map.get(arg).call(args)
File "/Library/Python/2.7/site-packages/legit/cli.py", line 162, in cmd_sync
status_log(unstash_it, 'Restoring local changes.', sync=True)
File "/Library/Python/2.7/site-packages/legit/cli.py", line 80, in status_log
log = func(_args, *_kwargs)
File "/Library/Python/2.7/site-packages/legit/scm.py", line 99, in unstash_it
'stash', 'pop', 'stash@{{0}}'.format(stash_index)])
File "/Library/Python/2.7/site-packages/git/cmd.py", line 377, in execute
raise GitCommandError(command, status, stderr_value)
git.exc.GitCommandError: 'git stash pop stash@{0}' returned exit status 1:

[kennethreitz]

That means there was a merge conflict when restoring the stashed content. I need to catch that and produce some pretty output saying what happened / how to fix it.

[neilmiddleton]

Something else that will need some tweaking is that when this occurs you can be left with a stash - the problem then lies further down the line when later syncs try to pop the stash which in itself can cause merging problems. Currently the only way round this is to drop the stash manually.

[cormamax]

So how do we fix this? I've tried to overriding my local code with what is in the repository, and git sync still gives me the error.

[AndrewKL]

this is rather annoying

[weakish]

duplicated by #35