Recommend zdiff3 instead of diff3 as merge.conflictstyle

[NicoWeio]

Quoting from The GitHub Blog:

The default value for this configuration is “merge”, which produces the merge conflict markers that you are likely familiar with. But there is a different mode, “diff3”, which shows the merge base in addition to the changes on either side.
Git 2.35 introduces a new mode, “zdiff3”, which zealously moves any lines in common at the beginning or end of a conflict outside of the conflicted area, which makes the conflict you have to resolve a little bit smaller.

The blog also includes a simple example.

[jpwgnr]

Sounds cool!

[maxnoe]

Git 2.35 is relatively new and probably won't be in many distributions in time for the next Workshop.

Will ubuntu 22.04 and does Fedora 35 have it?

[jpwgnr]

Git 2.35 is relatively new and probably won't be in many distributions in time for the next Workshop.

Will ubuntu 22.04 and does Fedora 35 have it?

I wanted to suggest to install anyway git via

sudo add-apt-repository ppa:git-core/ppa
sudo apt-get update
sudo apt install git

because the offical Ubuntu git release is way behind. The

git config --global init.defaultBranch main

isn't working there as well which could also be nice to add in the manual.

[maxnoe]

@jpherdi Since at the next workshop, we'll have 22.04 as current LTS, that might not be necessary.

I'd rather people update the OS than install ppas :D

[NicoWeio]

Will ubuntu 22.04 and does Fedora 35 have it?

Fedora 35 has it.
Ubuntu 22.04 won't, AFAICS.

[SepplL]

With all OS's and Repos more up-to-date: Do we still want that change? I guess now we can just include it without worrying about local git versions.

[LuckyJosh]

The current LTS Version of Ubuntu has git 2.43
https://packages.ubuntu.com/noble/git

so its fine to add this I guess 👍