Git 命令 冲突
来源:互联网 发布:人工智能项目 创始人 编辑:程序博客网 时间:2024/05/08 14:10
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
- Git 命令 冲突
- 使用git pull命令时冲突
- Git 命令提交项目代码处理冲突
- git 基本操作命令,冲突解决
- git 冲突
- Git冲突
- git冲突
- git冲突
- git冲突
- git 冲突
- Git冲突和解决冲突
- git 冲突解决
- git 冲突的解决
- git 冲突解决办法
- git 代码冲突解决方案
- git 解决冲突问题
- Git pull 冲突解决
- GIT 4 冲突解决
- iOS App开发那些事:如何选择合适的人、规范和框架?
- 拓展C++ STL功能,函数适配器,复合函数composite
- 蜗轮蜗杆联动动画
- Struts2国际化支持(中英文选择)
- 【Android】 Activity课件
- Git 命令 冲突
- 一个excel版进度管理软件的需求
- vi/vim滚动屏幕
- On the Separability of Structural Classes of Communities
- Linux伙计专用Hello World Java
- CALayer简介
- linux 系统管理命令
- 安卓自定义对话框(android.app.Dialog)
- 任意输入数学表达式,绘制数学函数图形