CONFLICT (content): Merge conflictMerge Conflict
Git 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.
Your repository is a shallow clone (created with --depth) and the remote does not accept pushes from shallow clones. The full history is needed for the push.
Unshallow the clone: git fetch --unshallow origin. Then push again. For CI environments, increase the clone depth or use a full clone instead of shallow.
git fetch --unshallow originCONFLICT (content): Merge conflictGit could not automatically merge changes because the same lines were modified in both branches.
fatal: remote origin already existsA remote with the specified name is already configured.
No local changes to saveGit stash found no modified tracked files to stash.
fatal: Unable to create lock fileA Git lock file (.lock) exists, preventing the operation.
error: object file is emptyA Git object file is corrupted and contains no data.
fatal: Not possible to fast-forward, abortingA pull with --ff-only failed because the branches have diverged.