Page MenuHomePhabricator

Feature request: Resolving merge conflicts from web interface
Open, Needs TriagePublicFeature

Description

As a developer,
When a patch of mine has a trivial merge conflict,
I'd like to be able to resolve the conflict using the online web interface,
Rather than needing to git pull to ensure that I have the latest version of master locally, git review -d the change ensure I have the latest version of the change locally, git rebase to start the rebase, manually fix the merge conflicts and add them to the rebase, git rebase --continue once I've resolved all of the conflicts, and finally git review -R to upload the rebased version.

Upstream : https://bugs.chromium.org/p/gerrit/issues/detail?id=12547

Event Timeline

Restricted Application added a project: User-DannyS712. · View Herald TranscriptJun 30 2020, 10:24 AM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
DannyS712 changed the subtype of this task from "Task" to "Feature Request".Jun 30 2020, 10:24 AM
DannyS712 moved this task from Unsorted to Others on the User-DannyS712 board.
hashar added a subscriber: hashar.

That is a feature for Upstream to implement. Interestingly such request just 3 months ago asking to perform the conflict resolution in the UI

https://bugs.chromium.org/p/gerrit/issues/detail?id=12547

hashar updated the task description. (Show Details)Jun 30 2020, 12:26 PM
Aklapper moved this task from Backlog to Reported Upstream on the Upstream board.Jun 30 2020, 12:40 PM