CONFLICT (content): Merge conflictMerge Conflict
Git could not automatically merge changes because the same lines were modified in both branches.
error: empty commit messageThe commit was aborted because the commit message is empty.
You saved an empty commit message in the editor, or passed an empty -m flag. Git requires a non-empty commit message for every commit.
Provide a meaningful commit message: git commit -m 'Your message'. If using an editor, write a message and save. To allow empty messages (not recommended): git commit --allow-empty-message.
CONFLICT (content): Merge conflictGit could not automatically merge changes because the same lines were modified in both branches.
error: sparse-checkout is not enabledA sparse-checkout operation was attempted but the feature is not enabled.
nothing to commit, working tree cleanThere are no changes to commit; the working directory matches the last commit.
fatal: ambiguous argumentGit cannot determine if the argument refers to a revision, path, or something else.
fatal: A branch named 'x' already existsA branch with the specified name already exists in the repository.
fatal: tag already existsA tag with the specified name already exists.