Lightlines
By cognitedata

pull-changes-resolve-conflicts

cognitedata

Bring branches together without silently losing work.

version control

What it does

Integrates updates from another Git branch while analyzing conflicts, prioritizing recommendations, and requiring user approval before resolution.

When to use it

Use when integrating another branch into the current feature branch or handling unmerged paths after a merge or rebase.

How to use it

Give it a branch integration or conflicted project; it analyzes conflicts, recommends resolutions, asks for direction, and applies only approved changes.

What you provide

  • An existing project

Uses


Access · 1

This skill

remote Git repository

Read

Fetches remote branch updates

What you need · 0

No setup requirements listed in the analysis.


About this skill

Visibility
Public
Repository
cognitedata/builder-skills
Created
Oct 8, 2026
Updated
Oct 8, 2026
Files
2