git checkout master

git checkout master
Branch 'master' set up to track remote branch 'master' from 'origin'.
Switched to a new branch 'master'

git checkout master
.gitignore: needs merge
error: you need to resolve your current index first

Related

• git reset --merge
• git checkout master && git pull

See also

• git checkout [ -b | master | main | -f ]
• git: [config | init | status ], git add, git rm, git commit, git push, git pull, .gitconfig, .gitignore, git (clone, fetch, pull), git tag, git log, git blame, Merge Request, LFS, git branch, git apply, git rebase, git diff, git diff-tree, git config --global, remote | submodule | request-pull, GIT_TRACE, GIT_CURL_VERBOSE, clean, main, git show-ref, git reset, git prune, git ls-remote origin, git checkout, git switch, pathspec, git credential-osxkeychain, git version, pre-commit, git --help, GitBook, refs/