Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow passing a --merge flag to skip the prompt when pushing up multiple entries #43

Closed
injoongy opened this issue Aug 27, 2021 · 1 comment
Labels
enhancement New feature or request

Comments

@injoongy
Copy link
Owner

What the title says - allow oriole push to accept a --merge, -m flag that bypasses the prompt. Maybe if you set it to true, it merges, and if you set it to false, it creates a new? So allows the user to bypass and go to either of the options?

@injoongy injoongy added the enhancement New feature or request label Aug 27, 2021
@injoongy
Copy link
Owner Author

injoongy commented Sep 6, 2021

After having attempted this, this turned out to be way more trouble than it's worth.

By introducing a "merge" option rather than a simple "replace", it seems easy - merging just means tacking on whatever's being pushed to the end of the existing note. Simple enough.

However, oriole itself has no idea what's been pushed and what hasn't - therefore, every time push runs, ALL the commits that oriole finds become the most recent, valid commits. In other words, if you push up commits a, b, and c, then add a new d commit, oriole will now show that you need to push up commits a, b, c, and d.

What this means is that for merging to work, we would need to essentially add some sort of diffing feature, where oriole compares the existing entry's notes field with the commits that it's about to push, and tries to merge the two. OR oriole needs to keep track of what's been pushed, and recognize only the commits that need to get pushed. Either way, it's a mountain of additional complexity and work.

Sorry - this ain't going to happen anytime soon. Maybe one day.

@injoongy injoongy closed this as completed Sep 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

1 participant