pomerium / pomerium / 21890602901

44%

Build Type

push

github

Committed by web-flow

Commit Message

Add custom git merge driver for components.json (#6068)

## Summary

Add a custom git merge driver that automatically resolves merge
conflicts in `internal/version/components.json` by picking the highest
semver version for each component.

This eliminates the recurring merge conflicts that occur when multiple
branches update component versions.

## Related issues

N/A

## User Explanation

No user-facing changes. This is a developer experience improvement that
reduces merge conflicts.

## Checklist

- [x] reference any related issues
- [ ] updated unit tests
- [x] add appropriate label (`enhancement`, `bug`, `breaking`,
`dependencies`, `ci`)
- [ ] ready for review

---

### Setup (required once after cloning)

```bash
make setup
```

This registers the merge driver in your local git config.

Run Details

34 of 102 new or added lines in 2 files covered. (33.33%)

15 existing lines in 2 files now uncovered.

31854 of 72452 relevant lines covered (43.97%)

118.03 hits per line