Systeme und Verfahren zur Code-Rebasing Und/oder Konfliktauflösung

Details

Veröffentlichungs-Nr.

EP4800546

Anmeldetag

30. Dezember 2025

Veröffentlichung

2. September 2026

Rechtsraum

EP

IPC

G06F8/71

Abstract

Systems and methods for code rebasing/conflict resolution are provided. For example, method for rebasing a software project is comprises: determining a set of changes between a branch version and a main version of the software project; identifying, from the set of changes, a conflict between the branch version and the main version; generating a user interface comprising at least one of: a first graphical representation of the conflict as implemented in the main version; or a second graphical representation of the conflict as implemented in the branch version; receiving, via the user interface, user input indicating a resolution for the presented conflict; and updating the branch version of the software project according to the indicated resolution, thereby resolving the conflict to facilitate merging of the branch of the software project onto the main version of the software project; wherein the method is performed using one or more processors.

Anmelder

Firma

Palantir Technologies Inc.

Land

🇺🇸 USA

Fachgebiete