diff options
Diffstat (limited to 'identity/identity.go')
| -rw-r--r-- | identity/identity.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/identity/identity.go b/identity/identity.go index d57e8ce0..720a1ebd 100644 --- a/identity/identity.go +++ b/identity/identity.go @@ -24,7 +24,7 @@ const idLength = 40 const humanIdLength = 7 var ErrNonFastForwardMerge = errors.New("non fast-forward identity merge") -var ErrNoIdentitySet = errors.New("user identity first needs to be created using \"git bug user create\"") +var ErrNoIdentitySet = errors.New("user identity first needs to be created using \"git bug user create\" or \"git bug user adopt\"") var ErrMultipleIdentitiesSet = errors.New("multiple user identities set") var _ Interface = &Identity{} @@ -391,11 +391,6 @@ func (i *Identity) Merge(repo repository.Repo, other *Identity) (bool, error) { return false, errors.New("can't merge identities that has never been stored") } - /*ancestor, err := repo.FindCommonAncestor(i.lastCommit, other.lastCommit) - if err != nil { - return false, errors.Wrap(err, "can't find common ancestor") - }*/ - modified := false for j, otherVersion := range other.versions { // if there is more version in other, take them |