CONFLICT (content): Merge conflictMerge Conflict
Git could not automatically merge changes because the same lines were modified in both branches.
nothing to commit, working tree cleanThere are no changes to commit; the working directory matches the last commit.
All changes have already been committed, or there are no modifications to tracked files. New untracked files are not included unless staged with git add.
This is informational, not an error. If you expected changes, check git status for untracked files. Stage new files with git add. Verify you are in the correct repository and branch.
CONFLICT (content): Merge conflictGit could not automatically merge changes because the same lines were modified in both branches.
fatal: shallow update not allowedA push from a shallow clone was rejected because the remote does not allow shallow updates.
error: corrupt loose objectA Git object file is corrupted and cannot be read.
fatal: A branch named 'x' already existsA branch with the specified name already exists in the repository.
error: could not apply commitA conflict occurred while applying a commit during rebase.
You are in 'detached HEAD' stateHEAD is pointing to a specific commit rather than a branch, meaning new commits will be orphaned.