andybalholm/pijul-go - Change A7XMU2A6FOHZKKFXFMQNJ7MEQ67IQTWYOZJAECP3NZIOZ2CCDANAC

A library for working with Pijul repositories in Go

Handle SolveOrderConflict hunks

Created by andybalholm on April 1, 2023

A7XMU2A6FOHZKKFXFMQNJ7MEQ67IQTWYOZJAECP3NZIOZ2CCDANAC

Dependencies

In channels

main

Change contents

Insertion in hunk.go at line 193 [4.32]
[2.1351]
[3.0]
```
	case 8:
		return solveOrderConflict(data)
```

Insertion in hunk.go at line 280 [4.32]

[2.1802]

[2.1802]

}
type SolveOrderConflict struct {
	Change Atom
	Local  Local
}
func (s SolveOrderConflict) atoms() []Atom {
	return []Atom{s.Change}
}
func solveOrderConflict(data []byte) ([]byte, SolveOrderConflict, error) {
	var s SolveOrderConflict
	data, _, err := tuple(
		assign(&s.Change, atom),
		assign(&s.Local, local),
	)(data)
	return data, s, err

Replacement in cmd/tijo-graph/main.go at line 149 [5.12977]
B:BD[5.15736] → [5.15736:15746]
```
		case 1:
```
[5.15736]
[5.15746]
```
		case 0, 1:
```