11 releases
0.2.6 | Apr 5, 2024 |
---|---|
0.2.5 | Nov 9, 2023 |
0.2.4 | Oct 5, 2023 |
0.2.0 | Sep 21, 2023 |
0.0.0 | Mar 20, 2021 |
#290 in Development tools
131 downloads per month
105KB
2.5K
SLoC
ddt
Dudy dev tools.
Installation
cargo install ddt
ddt git
ddt git resolve-conflict
This command allows you to resolve conflicts in lockfiles automatically.
Usage
Credit: https://github.com/Praqma/git-merge-driver#documentation
Add a custom merge driver to your global gitconfig file. (Typically ~/.gitconfig
)
[merge "ddt-auto"]
name = A custom merge driver used to resolve conflicts in lockfiles automatically
driver = ddt git resolve-conflict %O %A %B %L %P
then, add some entries to the .gitattributes
of your project.
You can specify this multiple times.
If your project uses pnpm
and cargo
for managing dependencies, you can add this to .gitattributes
:
pnpm.yaml merge=ddt-auto
Cargo.lock merge=ddt-auto
Dependencies
~18–36MB
~574K SLoC