search

sachac / subed

subed is a subtitle editor for Emacs
177 stars 16 forks source link

subed-vtt: Fix syncing point with player #22

Closed sachac closed 3 years ago

sachac commented 3 years ago
sachac commented 3 years ago

Hello, @rndusr! I think that if you merge this one, that gets it closer to a nicely working subed-vtt.el, and then we can sort out the merge-with-next/previous one afterwards. I notice that you force-pushed to get rid of the commits that I messed up. The following should probably work without conflicts:

git remote add sachac https://github.com/sachac/subed.git
git pull sachac subed-vtt

and then you can review it and push it.

Alternatively, I think the "Merge pull request" button in the web interface for https://github.com/rndusr/subed/pull/22 should do the trick too.

sachac commented 3 years ago

I think you had previously merged these commits in with https://github.com/rndusr/subed/pull/20 , but the recent push --force was with a commit that was earlier than that, so they got lost. https://github.com/rndusr/subed/pull/19 got lost, too. I'm not really sure what the proper git incantation is. Maybe "git pull sachac play-url" to merge in the second one, or apply the patch directly with curl https://patch-diff.githubusercontent.com/raw/rndusr/subed/pull/19.diff | patch -p1

Sorry my slightly distracted enthusiasm complicated things for you! =|

rndusr commented 3 years ago

Sorry, I forgot to mention I did a rebase on origin/master. There were duplicate commits in there and I had no idea what's happening.

Anyway, I think I have the vtt fixes and the play-url stuff. I created a "sacha" branch on GitHub we can work with and eventually merge into master.

The only thing that's missing should be the subtitle merging feature. I tried to merge your "merge-with-next" branch, but that doesn't seem to exist anymore. (Merging "play-url" worked like magic.)

And I'm sorry my git illiteracy put a throttle on your enthusiasm.

sachac commented 3 years ago

No, actually, it was probably my git illiteracy/distraction that probably led to the confusing commits in your tree. In any case, I think we're nearly done resolving it, hooray! Thanks for your patience!