Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
conflicts: Fix various issues with ResolveConflicts
Code
Review changes
Check out branch
Download
Patches
Plain diff
Patrick Steinhardt
requested to merge
pks-go-resolve-conflicts-incompat-pt2
into
master
Apr 21, 2021
Overview
10
Commits
14
Pipelines
6
Changes
16
Expand
Another round of fixes for the ResolveConflicts RPC.
Merge request reports
Loading