Since y'all liked #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏ #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

https://difftastic.wilfred.me.uk/

#Mergiraf v0.5.0 is out! Mergiraf is a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't.

https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.5.0

git mindfuck of the day:

• While merging branch B into branch A, A is “ours”, B is “theirs” (changes from B are reflected in A)

• When rebasing branch B on top of branch A, A is ”ours”, B is “theirs” (changes from A are reflected in B)

https://nitaym.github.io/ourstheirs/

Beyond Simple Upserts with #MERGE in #PostgreSQL | boringSQL https://notso.boringsql.com/posts/beyond-upserts-with-merge/

No more spending time on merge conflicts!

**mergiraf**: Solves Git conflicts automatically.

Uses AST of the language to do syntax-aware merging.

Written in Rust & supports many languages!

Docs: https://mergiraf.org/

Source: https://codeberg.org/mergiraf/mergiraf

#Trump transition team exploring ways to significantly #reduce, #merge, or even #eliminate top #bank #regulators in Washington WSJ reported on Thursday.. In recent interviews with potential candidates for leading these regulatory agencies, Trump advisers and officials from the newly established Department of Government Efficiency #DOGE have inquired about the possibility of the president-elect abolishing the #FDIC #banking #financialcrisis #financialstability #finance #economy #WallStreet

Wacky vs. Teamwork: Bogo Sort vs. Merge Sort

Can random guessing beat divide & conquer? This sorting showdown is pure MADNESS! Don't miss the results! https://hasty.dev/blog/sorting/bogo-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default

Someone please ping me when #python is added to the supported languages https://mergiraf.org/

Teamwork vs. Picky Picker : Merge vs. Selection Sort

Can collaboration conquer meticulousness? This sorting showdown is a battle of strategies! https://hasty.dev/blog/sorting/merge-vs-selection?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default

Merge vs. Quick Sort: Teamwork vs. Speedy Swordsman? ️

Can the collaborative Merge Sort outduel the lightning-fast Quick Sort? This sorting showdown is a real CLASH! https://hasty.dev/blog/sorting/merge-vs-quick?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default

Bucket vs Merge Sort: Sorting Showdown

Which reigns supreme for efficiency? Buckle up for a battle of the sorting algorithms! https://hasty.dev/blog/sorting/bucket-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default

#calendar #merge #webui #dev #3000USDT #python #js #go #rust

Друзья,
нужен разработчик, под мини-проект по "мерджу календарей для занятых"

Коллега-менеджер страдает переключаясь между календарями разных проектов. Хочет из нескольких источников объединить календари в один и расшарить дальше в котором занятые часы будут отображены как busy.

Не более, чем через месяцок должен получиться докер-контейнер или бинарь с несложным WebUI, которому скармливаем доступ к Google-календарю и т.п. Результат сразу в опенсурс выкладываем.

Репост, пожалуйста.

Recensie: Caribou – Honey ★★★
https://writteninmusic.com/albumrecensie/caribou-honey/

#git #merge --#squash is for people who don't know how to #rebase

if you ever wonder how to specify git merge strategy in magit, the flag is there but hidden (...)

press C-x a to list all merge flags

you'll see the -X strategy-option= now

how to merge four nvme SSD disks into one? Ubuntu 22.04 #partitioning #2204 #diskmanagement #nvme #merge

https://askubuntu.com/q/1520591/612

https://dev.to/vscodetips/vs-code-tip-of-the-week-3-way-merge-editor-416h - 3-way #merge view inside #VSCode. Nice tip https://www.linkedin.com/in/nickytonline. Might this pull me away from BeyondCompare?

When you are gonna #merge two #git branches after a long time