git-imerge VS duckduckgo-locales

Afaik, there's currently no official way to pause/stash a rebase/merge-in-progress. (There is git-imerge which supports incremental merges/rebases (basically split a big merge into smaller ones), but I never used it and think you'll need to use it from the start of a merge/rebase.)

Try git imerge.

If the merge is large in the number of commits involved git imerge may be useful to you. It breaks down one big merge into many smaller merges, essentially merging one new commit from each branch, one at a time. The advantage being that you only ever need to consider the conflict between two individual commits at a time.

The repo for it is https://github.com/mhagger/git-imerge and the blog post / instructions is at https://wilsonmar.github.io/git-imerge/

Similar ideas have been discussed before in Git, but I don't think anyone has acted on them much. Michael Haggerty's git-imerge tries to make conflicts shareable, but I think it was more of a side-effect of the original goal of optimizing rebase/merge and auto-reducing conflicts to their minimal representation. I'm very curious how conflicts are represented in Jujutsu so I can better understand this power. I'm curious about how conflicts in conflict-resolution commits are handled and other such magic.

That gist seems like a simplified version of https://github.com/mhagger/git-imerge, so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)

There's fraud and embezzlement in non-profits all the time. Just entering that in a search engine shows tons of examples: https://duckduckgo.com/?t=ffab&q=fraud+and+embezzlement+in+n...

When I was involved in scouts this was a thing as well; not even always due to malice, sometimes also due to incompetence and/or inattention.

Please install an ad blocker such as [1]. If you are on iOS look into a VPN-based ad blocker.

1. https://duckduckgo.com/?q=ublock+origin

No, I think the inspiration is more direct https://duckduckgo.com/?q=lewis+carroll+alice+in+wonderland+...

Yea caught me, I self reported to try and trick everyone. Jokes aside my comment was based on net neutrality if you don’t remember https://duckduckgo.com/?q=net+neitrality+bot+comments

Some of the stuff that really chipped at our privacy as our isps got to sell our dns pings to advertisers and social media. Have a good day citizen.

AI Chat is separate from the search engine. On the search engine we have DuckAssist, which is currently grounded in Wikipedia (more sources coming): https://duckduckgo.com/?q=what+is+the+stoichiometric+ratio+b...

that one is good, but I detest keyboards with their own magic little dongle since it's a damn fine thing to misplace

I'm surprised OP didn't enjoy https://www.microsoft.com/en-us/d/surface-ergonomic-keyboard... which is currently listed as out of stock but I dunno if that means "permanently" or what, but they seem to be available via 3rd party channels

Its "klacking" aside, pour one out for https://duckduckgo.com/?q=microsoft+natural+elite+keyboard&t... which I loved, although I'll be straight that I love the Surface Ergonomic better because I think its keytravel is much, much nicer and no weirdo + shaped cursor keys, the inverted T like $diety intended

Sculpture can be tactile. I know it's not purely tactile, but thinking of it in that way is becoming a lot more common (eg at the Louvre). And then I went to find a URL for the tactile dome at the Exploratorium in San Francisco (https://www.exploratorium.edu/visit/tactile-dome) and it turns out there are lots of tactile galleries now:

https://duckduckgo.com/?q=tactile+gallery&t=fpas&ia=web