记一次git使用

首次上传到远程develop分支

1，git status  ,

2，git remote add origin http://gitlab.xxx.net/ge.git  

3，错误：fatal: refusing to merge unrelated histories 

git pull origin master --allow-unrelated-histories

4，git push origin master,

5，提交代码的时候发生冲突.  
git push

hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

git pull

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

因有冲突文件 需 git  status 再一次 git add .  git commit 之后git push 就ok