CONFLICT (content): Merge conflictMerge Conflict
Git could not automatically merge changes because the same lines were modified in both branches.
fatal: Unable to create lock fileA Git lock file (.lock) exists, preventing the operation.
A previous Git operation was interrupted or crashed, leaving behind a lock file (usually .git/index.lock). Another Git process may also be running concurrently.
Ensure no other Git processes are running. Remove the stale lock file: rm -f .git/index.lock. If using a GUI client, close it first. On Windows, a background process may hold the file; check Task Manager.
rm -f .git/index.lockCONFLICT (content): Merge conflictGit could not automatically merge changes because the same lines were modified in both branches.
warning: CRLF will be replaced by LFGit is converting line endings from Windows-style (CRLF) to Unix-style (LF).
fatal: remote origin already existsA remote with the specified name is already configured.
fatal: branch is already checked out at another worktreeThe branch cannot be checked out because it is already checked out in another worktree.
fatal: refusing to merge unrelated historiesGit refuses to merge two branches that do not share a common ancestor.
fatal: Not possible to fast-forward, abortingA pull with --ff-only failed because the branches have diverged.