因为要跟别的公司一块合作开发，我们用svn他们用git，现在又得用git
我在提交的时候：报如下错误：
git.exe push --progress "origin" master:master
To http://120.92.190.195:9182/smart-community/sc-front.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'http://120.92.190.195:9182/smart-community/sc-front.git'
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 did not exit cleanly (exit code 1) (1547 ms @ 2018/10/29 17:45:30)
首先他们说在：
E:\scgit\sc-front\.git\config 这个文件中
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = http://120.92.190.195:9182/smart-community/sc-front.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
添加下面这部分
[http]
postBuffer = 5242880000
解决方案：我采用下面的第二种方法解决的，并且没有用torisegit，而是用的命令，执行的下面2那个命令，我先执行了1，又执行了2，就好了
----------
刚创建的github版本库，在push代码时出错：
$ git push -u origin master
To [email protected]:******/Demo.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:******/Demo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
网上搜索了下，是因为远程repository和我本地的repository冲突导致的，而我在创建版本库后，在github的版本库页面点击了创建README.md文件的按钮创建了说明文档，但是却没有pull到本地。这样就产生了版本冲突的问题。
有如下几种解决方法：
1.使用强制push的方法：
$ git push -u origin master -f
这样会使远程修改丢失，一般是不可取的，尤其是多人协作开发的时候。
2.push前先将远程repository修改pull下来
$ git pull origin master
$ git push -u origin master
3.若不想merge远程和本地修改，可以先创建新的分支：
$ git branch [name]
然后push
$ git push -u origin [name]
------------------------------------------