diff options
Diffstat (limited to 'entities/identity/identity.go')
| -rw-r--r-- | entities/identity/identity.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/entities/identity/identity.go b/entities/identity/identity.go index b0cee43b..22ce652c 100644 --- a/entities/identity/identity.go +++ b/entities/identity/identity.go @@ -383,9 +383,9 @@ func (i *Identity) NeedCommit() bool { // cleaning would be required. // // An alternative approach would be to have a determinist rebase: -// - any commits present in both local and remote version would be kept, never changed. -// - newer commits would be merged in a linear chain of commits, ordered based on the -// Lamport time +// - any commits present in both local and remote version would be kept, never changed. +// - newer commits would be merged in a linear chain of commits, ordered based on the +// Lamport time // // However, this approach leave the possibility, in the case of a compromised crypto keys, // of forging a new version with a bogus Lamport time to be inserted before a legit version, |