ts-comint
ts-comint copied to clipboard
emacs-typescript
upstream merge
would be nice to have some of those bugfixes merged into this fork. @josteink can you check if there is anything useful?
23 commits behind the upstream and has conflicts that must be resolved.
Seems like quite a bit of things have diverged since I made my small fork, and that merging won't be trivial.
I'm definitely not against trying to better align with a new upstream version, but I'm not sure I will have time to follow this closely any day soon.
If you could help try to resolve some of the merge-conflicts, I could probably more easily review this PR and see if I think the changes makes sense for this project too :)
Indeed this seems like a quite difficult merge to make. I may try to help with a couple of merges, but i don't think have the required knowledge in this code base / elisp for this task.
But yeah, this would be a great effort so we can continue merging with the upstream getting new features / bugfixes :)
GitHub says there’s conflicts which needs to be resolved. Are you looking into that? 🙂
I really appreciate the endurance here. This is the PR which comes back from the dead and just refuses to die 😄
That said, like I've already mentioned, there are merge conflicts and I cannot merge this PR without those getting resolved.
Can you take a look?
@kaue & @saffroy : Nice update, but you are still not resolving the conflicts, so I cannot merge this....
@josteink I don't quite understand what you expect from me here.
I sent PRs to the upstream project, they were merged there without conflict.
Anything that happens in a fork from upstream is not something I can be aware of (and I wasn't until you pinged me here), nor is it something I should be concerned with simply because it exists.
It looks like this PR automatically tracks the master branch from upstream, so of course it's a moving target, and upstream changes can become conflicts here. Maybe that was a mistake?
