1、git push -u origin newbra:LJX
报错:Everything up-to-date
解决办法:【投机取巧的办法(如果想彻底解决分支冲突,可以找相关内容)】
在原项目中新建任意一个任意文件,只要和以前的不一样就可以啦。
然后git add . --> git commit -m "****" --->git push -u origin newbra:LJX
重新提交了。
2、$ git push -u origin newbra:LJX
报错:fatal: 'origin' does not appear to be a git repository
fatal: Could not read from remote repository.
解决办法:
查看本地【.git/config】文件:
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = git@se.nke.com:live-education/Group5.git
fetch = +refs/heads/*:refs/remotes/origin/*
pushurl =git@se.nke.com:live-education/Group5.git
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "Liu"]
remote = origin
merge = refs/heads/LJX
[branch "newbra"]
remote = origin
merge = refs/heads/LJX
主要是标红的地方是否存在与正确。
然后【git pull】-->【git pull --rebase origin LJX】-->【git push -u origin newbra:LJX】
3、git branch dev
报错:fatal: Not a valid object name: 'master'如果本地没有文件,请添加一个本地文件,然后ls,查看一下。
【git branch ljx】成功!
遇到的问题相当的多,暂时只写这几个,太晚了,睡了睡了!