search

transistor1 / shellista-git

Git plugin for Shellista
2 stars 1 forks source link

git pull error #5

Open briarfox opened 10 years ago

briarfox commented 10 years ago

I've been getting errors when using git pull form a repo that has been pushed to from another device. This also happens if I accept pull requests, I am unable to update my pythonista project. I usually have to delete the project and git clone it again.

The error is: Error: ['175205bac4a9bf790bdabd337d76a2ded1c08d7b', '36947ac8098c284ac2cc60875a8463746629fc94']

briarfox commented 10 years ago

Seems to be an issue with gittle.

cjchallis commented 9 years ago

I have the same error (different hex codes, of course). My solution is also to delete the project and git clone again. Disappointing since the main use I had in mind for shellista was git functionality across devices.

You mention an issue with gittle - did you figure anything out with this?

transistor1 commented 9 years ago

Unfortunately I haven't looked at this code in a while because I have been insanely busy & also haven't worked in Pythonista in a while.

Please feel free to do a pull request if you have the time to investigate the issue -- I am happy to add you (or anyone else who has time) to the project if you wish.

Are you using the dev-modular branch of the code? I ask because the master branch for the git code is much more rudimentary. I am not sure if this is something that was fixed in the modular branch since the last time I looked at the code.

Sent from my phone

I have the same error (different hex codes, of course). My solution is also to delete the project and git clone again. Disappointing since the main use I had in mind for shellista was git functionality across devices.

You mention an issue with gittle - did you figure anything out with this?

— Reply to this email directly or view it on GitHub https://github.com/transistor1/shellista-git/issues/5#issuecomment-81660977 .

jsbain commented 9 years ago

I believe this issue is often caused by the local repo not being an ancestor of the version being pushed. FYI, in the stash version of git, I've sort of corrected this issue -- it is now possible to do a git fetch, followed by a git merge, which corrects any issues of the two copies of the repo diverging.

Most of the active development has been going on in the stash version of git -- I started with transistor's work, but have added a number of additional commands and features.... It should be possible to port back to shellista, though I have not spent the time doing that yet

cjchallis commented 9 years ago

Great, I wasn't aware of StaSh. I'll try it out - it sounds like fetching and merging should work.

Update: Tried with StaSh and git pull worked perfectly. Didn't even need to fetch and merge. Thanks!