learnwy

git add fileName [fileName ]

git commit -m "update message"

git push <remote-name> <branch-name>

add branch

git branch <branch-name>

switch branch

git checkout <branch-name>

delete branch

git branch -d <branch-name>

git fetch <remote-name> <branch-name>

git diff <local-branch-name> <remote-name>/<brance-name>

git merge <local-branch-name> <remote-name>/<branch-name>

if there has some different from temp and remote

git checkout --ours fileName git checkout --theirs fileName