本地git init 后代码冲突解决

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v origin refs/heads/master:refs/heads/master 

Pushing to https://Server.git

2018-07-18 16:06:39.289 git-credential-sourcetree[10397:127969] Error generating password due to missing uuid. Please report this to Atlassian.

2018-07-18 16:06:39.289 git-credential-sourcetree[10397:127969] Password encryption failed - key to to encrypt password is unavailable (nil)

To https:/.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'https://.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.

Completed with errors, see above

本地和远程冲突所导致：

git push -u origin master -f