From 78b4ab8003abd58d95da1a609a919d8fe5184d2a Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Mon, 23 Jan 2023 13:41:33 -0800 Subject: [PATCH] PR feedback --- go/libraries/doltcore/env/actions/branch.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go/libraries/doltcore/env/actions/branch.go b/go/libraries/doltcore/env/actions/branch.go index a7660decdc..8054bb10b3 100644 --- a/go/libraries/doltcore/env/actions/branch.go +++ b/go/libraries/doltcore/env/actions/branch.go @@ -199,7 +199,7 @@ func validateBranchMergedIntoCurrentWorkingBranch(ctx context.Context, dbdata en return err } - isMerged, _ := branchHead.CanFastForwardTo(ctx, cwbHead) + isMerged, err := branchHead.CanFastForwardTo(ctx, cwbHead) if err != nil { if errors.Is(err, doltdb.ErrUpToDate) { return nil @@ -208,7 +208,6 @@ func validateBranchMergedIntoCurrentWorkingBranch(ctx context.Context, dbdata en return ErrUnmergedBranch } - // TODO: no common ancestor is not an error return err } @@ -259,7 +258,6 @@ func validateBranchMergedIntoUpstream(ctx context.Context, dbdata env.DbData, br if errors.Is(err, doltdb.ErrIsAhead) { return ErrUnmergedBranch } - // TODO: no common ancestor is not an error return err }