ddt 0.2.0

Useful cli tools
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

# ddt

Dudy dev tools.

# Installation

```sh
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`)

```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`:

```gitattributes
 pnpm.yaml merge=ddt-auto
 Cargo.lock merge=ddt-auto
```