git第二天学习_将远程仓库拉取到本地

1. 添加远程仓库并为其取别名

git remote origin(取一个远程仓库在本地仓库的别名) url(远程仓库地址)

2. 查看当前有哪些远程仓库

git remote -v   (查看详细信息)
git remote      (查看已存在的远程仓库)

3. 推送本地分支上的内容到远程仓库

git push origin(别名) master(分支名)

4. 将远程仓库克隆到本地

git clone url

5. 将远程仓库对于分支最新内容拉取下来后与当前本地分支合并

git pull origin(远程仓库别名) master(远程分支名)

6. 练习记录

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git remote -v

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git remote add origin https://gitee.com/caoyusuiyuexiangban/git-demo.git

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git remote -v
origin  https://gitee.com/caoyusuiyuexiangban/git-demo.git (fetch)
origin  https://gitee.com/caoyusuiyuexiangban/git-demo.git (push)

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git push -u origin master
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (21/21), 1.70 KiB | 248.00 KiB/s, done.
Total 21 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.3]
To https://gitee.com/caoyusuiyuexiangban/git-demo.git
 * [new branch]      master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ cat README.txt
hello git!

2222222222222222222
aaaaaaaaaaaaaaa

222222222222222222

33333333333333333

作业
小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git pull origin master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 932 bytes | 4.00 KiB/s, done.
From https://gitee.com/caoyusuiyuexiangban/git-demo
 * branch            master     -> FETCH_HEAD
   e587a75..70b3373  master     -> origin/master
Updating e587a75..70b3373
Fast-forward
 README.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ cat README.txt
hello git!

2222222222222222222
aaaaaaaaaaaaaaa

222222222222222222

33333333333333333

作业

77777777777777777777
小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ vim README.txt
Z
小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git add README.txt

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git commit -m '本地仓库提交内容'
[master 9acb32c] 本地仓库提交内容
 1 file changed, 3 insertions(+), 1 deletion(-)

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ cat README.txt
hello git!

2222222222222222222
aaaaaaaaaaaaaaa

222222222222222222

33333333333333333

作业

77777777777777777777

本地88888888888888

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git push origin master
To https://gitee.com/caoyusuiyuexiangban/git-demo.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://gitee.com/caoyusuiyuexiangban/git-demo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git pull origin master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 970 bytes | 4.00 KiB/s, done.
From https://gitee.com/caoyusuiyuexiangban/git-demo
 * branch            master     -> FETCH_HEAD
   70b3373..39e3f32  master     -> origin/master
Auto-merging README.txt
CONFLICT (content): Merge conflict in README.txt
Automatic merge failed; fix conflicts and then commit the result.

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master|MERGING)
$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   README.txt

no changes added to commit (use "git add" and/or "git commit -a")

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master|MERGING)
$ cat README.txt
hello git!

2222222222222222222
aaaaaaaaaaaaaaa

222222222222222222

33333333333333333

作业

77777777777777777777

<<<<<<< HEAD
本地88888888888888
=======


gitee999
>>>>>>> 39e3f32a59615a69f06d09c3ebbda198d1e53c14

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master|MERGING)
$ git add README.txt

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master|MERGING)
$ git commit -m '解决远程仓库与本地仓库冲突问题'
[master dd18367] 解决远程仓库与本地仓库冲突问题

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git pull origin master
From https://gitee.com/caoyusuiyuexiangban/git-demo
 * branch            master     -> FETCH_HEAD
Already up to date.

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git push origin master
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (6/6), 635 bytes | 317.00 KiB/s, done.
Total 6 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-6.3]
To https://gitee.com/caoyusuiyuexiangban/git-demo.git
   39e3f32..dd18367  master -> master

小新@ŵŵ MINGW64 /e/niit_shixun/git/git-demo (master)
$ git branch -a
  dev
* master
  remotes/origin/master