Git 命令 冲突

 error1： You have local changes to 'CBasicServer/Makefile.am'; cannot switch branches.

[root@localhost cswapserver]# git checkout feature/development
error: You have local changes to 'CBasicServer/Makefile.am'; cannot switch branches.

如果要弃工作区的修改：git checkout  -- CBasicServer/Makefile.am

弃工作区的修改

[root@localhost cswapserver]# git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   CBasicServer/Makefile.am
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .configure.in.swp
#       CBasicServer/Makefile.in

no changes added to commit (use "git add" and/or "git commit -a")
[root@localhost cswapserver]# git checkout  -- CBasicServer/Makefile.am
[root@localhost cswapserver]# git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .configure.in.swp
#       CBasicServer/Makefile.in
nothing added to commit but untracked files present (use "git add" to track)
[root@localhost cswapserver]#

error2

failed to push some refs to .......

$ git status
On branch feature/development
Your branch and 'origin/feature/development' have diverged,
and have 1 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)


All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)


Changes to be committed:


        modified:   datacenter/databus/sdbusserver.cpp
        modified:   datacenter/model/model.cpp
        modified:   datacenter/model/model.h
        modified:   view/trade/tradeconfirm.cpp
        modified:   view/trade/tradeedit.cpp
        modified:   view/trade/tradeedit.h




10@10-PC /e/comodity/cswapclient_new (feature/development|MERGING)
$

solution for sourceTree:

1. commit 

        modified:   datacenter/databus/sdbusserver.cpp
        modified:   datacenter/model/model.cpp
        modified:   datacenter/model/model.h
        modified:   view/trade/tradeconfirm.cpp
        modified:   view/trade/tradeedit.cpp
        modified:   view/trade/tradeedit.h

2.  push