Resolve conflicts · Merge requests · Project · User · Help - GitLab

Merge conflict resolution ... Introduced in GitLab 8.11. ... Once all conflicts have been marked as using 'ours' or 'theirs', the conflict can be resolved. This ... Mergeconflictresolution IntroducedinGitLab8.11. Whenamergerequesthasconflicts,GitLabmayprovidetheoptiontoresolve thoseconflictsintheGitLabUI.(See conflictsavailableforresolutionfor moreinformationonwhenthisisavailable.)Ifthisisanoption,youwillsee aresolvetheseconflictslinkinthemergerequestwidget: Clickingthiswillshowalistoffileswithconflicts,withconflictsections highlighted: Onceallconflictshavebeenmarkedasusing'ours'or'theirs',theconflict canberesolved.Thiswillperformamergeofthetargetbranchofthemerge requestintothesourcebranch,resolvingtheconflictsusingtheoptions chosen.Ifthesourcebranchisfeatureandthetargetbranchismaster, thisissimilartoperforminggitcheckoutfeature;gitmergemasterlocally. Mergeconflicteditor IntroducedinGitLab8.13. Themergeconflictresolutioneditorallowsformorecomplexmergeconflicts, whichrequiretheusertomanuallymodifyafileinordertoresolveaconflict, tobesolvedrightformtheGitLabinterface.UsetheEditinlinebutton toopentheeditor.Onceyou'resureaboutyourchanges,hitthe Commitconflictresolutionbutton. Conflictsavailableforresolution GitLaballowsresolvingconflictsinafilewhereallofthebelowaretrue: Thefileistext,notbinary ThefileisinaUTF-8compatibleencoding Thefiledoesnotalreadycontainconflictmarkers Thefile,withconflictmarkersadded,isnotover200KBinsize Thefileexistsunderthesamepathinbothbranches Ifanyfilewithconflictsinthatmergerequestdoesnotmeetallofthese criteria,theconflictsforthatmergerequestcannotberesolvedintheUI. Additionally,GitLabdoesnotdetectconflictsinrenamesawayfromapath.For example,thiswillnotcreateaconflict:onbrancha,doinggitmvfile1 file2;onbranchb,doinggitmvfile1file3.Instead,bothfileswillbe presentinthebranchafterthemergerequestismerged.