git pull

[atlaschiew]

git pull will merge the conflicted files into ur local copy. For safety, we can use git fetch to check the change.

preview git pull

# preview git pull
git fetch -v
git log -p HEAD..origin/main
git diff HEAD..origin/main

# apply the changes by merge..
git merge origin/main

# .. or just pull the changes
git pull

git pull --rebase origin master