Git rescue agent

Inspiration

A confusing merge/rebase issue—especially terms like current, incoming, ours, and theirs—inspired us to build a simpler solution.

What it does

Git Rescue analyzes merge requests, explains conflicts, and provides safe resolution and rollback steps.

How we built it

We combined a GitLab Duo agent, automated flow, reusable skills, and GitLab repository tools.

Challenges we ran into

Handling merge and rebase terminology correctly while avoiding unsafe Git operations.

Accomplishments that we're proud of

It can inspect real MR context and post a clear conflict-resolution plan directly on GitLab.

What we learned

We learned how GitLab Duo agents, flows, skills, tools, and triggers work together.

What's next for General Agent

Add automatic fixes on a separate branch, run tests, and let developers approve the result.

Built With

• agent
• ai