Resolve Pr Conflicts

Resolve merge conflicts in an open pull request for this repository. Use when the user says "/resolve-pr-conflicts", asks to fix PR conflicts, says a pull request cannot merge because it is behind main, asks to update a PR branch from main, or asks to make a conflicted PR testable again.

jtenniswood Updated 1.2k repo stars
EspFrame displaying Immich photos on a Guition ESP32-P4 touchscreen

File contents

jtenniswood/espframe commit a669073f9e

Frequently asked questions

npx get-skill add jtenniswood/resolve-pr-conflicts-2