在下面的
博客基础上 , 已经出现了文件冲突 ;
主版本 master 分支中 , 冲突文件 README.txt 内容如下 :
<<<<<<< HEAD
master
=======
feature1
>>>>>>> feature1
手动编辑上述文件 , 编辑该文件的工作 , 就是处理文件冲突的核心工作 ;
master & feature1
编辑完成后 , 开始提交并推送 已经解决的 冲突文件 ;
执行
git add README.txt
命令 , 将文件提交到暂存区 , 执行
git commit -m "master"
命令 , 提交文件到版本库 , 执行
git status
查看是否处理干净 , 执行
git push origin master
将主分支推送到远程仓库中 ;
执行过程 :
D:\Git\git-learning-course>git add README.txt
D:\Git\git-learning-course>git commit -m "master"
[master e9d0ace] master
D:\Git\git-learning-course>
D:\Git\git-learning-course>git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
D:\Git\git-learning-course>
D:\Git\git-learning-course>git push origin master
info: detecting host provider for 'https://codechina.csdn.net/'...
info: detecting host provider for 'https://codechina.csdn.net/'...
warning: redirecting to https://codechina.csdn.net/han12020121/git-learning-course.git/
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 12 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 366 bytes | 366.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
remote: GitLab: http post to gitlab api /post_receive endpoint: 500 Internal Server Error
To https://codechina.csdn.net/han12020121/git-learning-course
c9842ef..e9d0ace master -> master
D:\Git\git-learning-course>