无法将我的分支合并到主人

时间:2018-05-02 08:31:35

标签: git merge branch

我克隆了一个repositroy来在localhost中工作并将我的工作推向主人。我用户git commit和git pull和git push,我连接到ssh以使git pull获取当前版本,但没有任何东西推送到服务器。 这是我的git配置:

[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = ssh://ubid_electricity@thomas-mifflin.dreamhostelectricity.com.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "frontoffice"]
remote = origin
merge = refs/heads/frontoffice
[branch "developpement_khaled"]
remote = origin
merge = refs/heads/developpement_khaled
[branch "master"]
remote = origin
merge = refs/heads/master

0 个答案:

没有答案