Signed-off-by: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
This commit is contained in:
Soc Virnyl Estela 2024-07-01 21:43:13 +08:00
parent d19afb96db
commit c67b86dd6e
Signed by: uncomfyhalomacro
SSH key fingerprint: SHA256:9Ez84JDMZLHJvRH+Kjgvlb+eX82QYEW127e6Rj66zBY

View file

@ -77,7 +77,7 @@ This means, users can delete a traversal while preserving the changes.
Yes. Fortunately, it is unlikely for the by-default recorded traversal because
it imitates Git's linear history.
Howerver, if the user wants to do some changes that requires conflict resolution when
However, if the user wants to do some changes that requires conflict resolution when
selecting which change to traverse, they will be able to by creating a shallow
snapshot of the overall traversal and then do some conflict resolution there.