mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions
A syntax-aware git merge driver for a growing collection of programming languages and file formats. https://mergiraf.org/
463 commits 4 branches 20 tags 5.1 MiB
Find a file
vaw 6d3d589d8f
All checks were successful
/ test (push) Successful in 47s
Details
feat(rust): Add derive attribute as commutative parent (#614) 
Fixes #605.

Also add a rust test case for #613.

Reviewed-on: #614
Reviewed-by: Ada Alakbarova <ada4a@noreply.codeberg.org>
Co-authored-by: vaw <git@nlih.de>
Co-committed-by: vaw <git@nlih.de>
2025-10-10 17:02:02 +02:00
.cargo tests: Utility to minimize test cases, continued (#527) 2025-09-11 23:47:22 +02:00
.forgejo/workflows chore: Update to Rust 1.89 (#579) 2025-09-02 11:14:26 +02:00
doc feat(Git): support reading language from git attributes (#599) 2025-09-30 14:30:08 +02:00
examples feat(rust): Add derive attribute as commutative parent (#614) 2025-10-10 17:02:02 +02:00
helpers dev: add cargo shortcuts for the subcommands of mergiraf and mgf_dev (#499) 2025-07-22 14:35:08 +02:00
mgf_dev feat(Git): support reading language from git attributes (#599) 2025-09-30 14:30:08 +02:00
src feat(rust): Add derive attribute as commutative parent (#614) 2025-10-10 17:02:02 +02:00
tests feat(Git): support reading language from git attributes (#599) 2025-09-30 14:30:08 +02:00
.clippy.toml refactor: rename tree.rs to ast.rs (#324) 2025-04-16 09:43:13 +00:00
.envrc feat: Add Nix flake (#16) 2024-11-12 10:06:49 +00:00
.gitattributes git(attributes): set the conflict marker size in all files (#202) 2025-02-12 08:24:36 +00:00
.gitignore accomodate cargo-flamegraph (#257) 2025-03-13 08:03:30 +00:00
.mailmap git: change name using .mailmap (#253) 2025-03-08 17:48:50 +00:00
build.rs tests: Re-run if examples/ directory changed (#381) 2025-05-13 09:15:49 +00:00
Cargo.lock chore: Better error types for TreeBuilder (#563) 2025-10-03 10:40:52 +02:00
Cargo.toml chore: Better error types for TreeBuilder (#563) 2025-10-03 10:40:52 +02:00
cliff.toml chore(changelog): add commit ids to log entries without names (#547) 2025-07-28 21:19:01 +02:00
CONTRIBUTING.md chore: Add CONTRIBUTING.md (#438) 2025-07-03 18:15:25 +02:00
flake.lock chore: Update to Rust 1.89 (#579) 2025-09-02 11:14:26 +02:00
flake.nix flake: add mdbook (#243) 2025-03-06 21:57:06 +00:00
GOVERNANCE.md Add governance document 2024-11-01 20:38:33 +01:00
LICENSE.txt Initial release 2024-11-01 14:06:12 +01:00
members.yml governance: Make mathstuf a developer (#566) 2025-08-21 10:20:12 +02:00
README.md chore: Add CONTRIBUTING.md (#438) 2025-07-03 18:15:25 +02:00

README.md

Mergiraf

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

See the documentation.

We welcome contributions and new team members, see CONTRIBUTING.md.

License: GPLv3