Git 问题总结

• warning: CRLF will be replaced by LF in android/gradlew.bat.
  解决办法：

$ git config core.autocrlf false

• git pull 或 git push 时 报错 fatal: refusing to merge unrelated histories 解决办法
  在你操作命令后面加--allow-unrelated-histories
  例如：

$ git pull origin master --allow-unrelated-histories

• error: failed to push some refs to 'https://github.com/Smiley1994/flutter_temp.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.
  解决办法：

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]  
 git push -u origin [name]