mastodon.gamedev.place is one of the many independent Mastodon servers you can use to participate in the fediverse.
Mastodon server focused on game development and related topics.

Server stats:

5.6K
active users

#difftastic

0 posts0 participants0 posts today

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.

difftastic.wilfred.me.uk/

difftastic.wilfred.me.ukDifftastic, a structural diff tool that understands syntaxDifftastic, a structural diff tool that understands syntax
Replied in thread

@blaue_Fledermaus

Adding support for #difftastic

difftastic.wilfred.me.uk/git.h

Using

```
[includeIf "gitdir:~/work/"]
path = ~/path/to/work/.gitconfig
[includeIf "gitdir:~/personal/"]
path = ~/path/to/pesronal/.gitconfig
```

so you can use different git configurations for different paths.

Using diff3 for conflicts

```
[merge]
conflictStyle = diff3
```

difftastic.wilfred.me.ukGit - Difftastic ManualThe manual for difftastic, the structural diff tool

The popularity of "modern" replacements for classic #unix #commandline tools is an interesting phenomenon. Many are born from fresh perspectives and experimentation, which is great. But saving a few cpu cycles and fancier output is not enough to make me abandon a familiar, trusted and ubiquitous tool.

However, #Mergiraf & #Difftastic bring a lot more to the table. Syntax-aware merge conflict resolution and diffing has now become essential to me.

mergiraf.org/
difftastic.wilfred.me.uk/

mergiraf.orgIntroduction - MergirafA syntax-aware git merge driver for a growing collection of programming languages and file formats.