search

Flamenco / stackeditpro

A version of stackedit with professional features.
19 stars 2 forks source link

StackEditPro cruft complicates rebase workflow #18

Closed hoclun-rigsep closed 2 years ago

hoclun-rigsep commented 2 years ago

I have to review my authors' work but when I skip commits during a rebase I get conflicts because of SEP's trailing comment. Anyone have any ideas how to smooth this out?

Flamenco commented 2 years ago

This is an implementation from upstream, so best to ask there.

@hoclun-rigsep If the comment is metadata, can't you just merge it in?

hoclun-rigsep commented 2 years ago

Yes but not automatically. If I rebase a series of commits made with SEP but skip some of the commits, git's patch algo doesn't (can't) resolve automatically. --

Flamenco commented 2 years ago

It seems like a limitation of the upstream, so I am going to close this as "out of our jurisdiction".

hoclun-rigsep commented 2 years ago

Yes it is a limitation of upstream and even if it weren't you'd have to change the way this cruft is stored in order to do anything about it from within this code. However: upstream is dead. Users of SEP may want to know what your plan/policy is for actionable issues that are "upstream" going forward.

Flamenco commented 2 years ago

Understood, but as we have started using a different product in-house, we have continued to renew our SSL certificate and provide a host server as a convenience and goodwill to the community.

If this were an app breaking issue, we would possibly dedicate the resources to look into an upstream issue. We would also integrate a PR if it was submitted to the upstream project, even though they are not active.

In your case, the issue just means more commits in GIT. Not really app breaking. From the start of this project, we have clearly stated that we add features, fix major bugs, provide a host, and do not charge a fee for the service.

hoclun-rigsep commented 2 years ago

Understood—I find all of what you say here reasonable.

Flamenco commented 2 years ago

As much as we like StackEdit, there were some major design issues that made the project too difficult to continue extending.

We ended up creating a project that employs real-time collaborative editing, and replaces the folder tree for organizing documents with a much more flexible solution.

Perhaps it will be released to the public one of these days.