Skip to content

Commit ec3b9bb

Browse files
committed
Update MainlineVersionCalculator.cs
conflict fix
1 parent 89a197e commit ec3b9bb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ private IBranch GetMainline(ICommit? baseVersionSource)
202202
/// <returns>The best possible merge base between the current commit and <paramref name="mainline"/> that is not the child of a forward merge.</returns>
203203
private ICommit FindMergeBaseBeforeForwardMerge(ICommit? baseVersionSource, IBranch mainline, [NotNullWhen(true)] out ICommit? mainlineTip)
204204
{
205-
var mergeBase = repositoryStore.FindMergeBase(context.CurrentCommit, mainline.Tip);
205+
var mergeBase = this.repositoryStore.FindMergeBase(context.CurrentCommit, mainline.Tip);
206206
//var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(mergeBase.Parents.FirstOrDefault(), mainline.Tip).ToList();
207207
var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersionSource, mainline.Tip).ToList();
208208

0 commit comments

Comments
 (0)