no branch 问题

现象如下：

lynn.feng:~/project/Git/M_MT6737_MP$ git branch -a
* (no branch)
a36_panasonic_l004
b36_panasonic_tmp
master

lynn.feng:~/project/Git/M_MT6737_MP$ git checkout master
kernel-3.18/drivers/input/touchscreen/mediatek/GT9XX_B36/gt9xx_driver.c: needs merge
error: you need to resolve your current index first

lynn.feng:~/project/Git/M_MT6737_MP$ git status
# Not currently on any branch.

该问题已经说的很明白了，有文件没有提交，所以git树无法统一，解决方法如下：

git reset --merge

时间： 2024-12-17 12:48:39

no branch 问题的相关文章

git clone远程branch和tag

接着上一个笔记讲,我们想从remote repository上获取某个branch的某个tag.这句可以理解为,以angular,我们想获得angular的angular1的v.0.1.1的版本. 1.查看远程分支git branch -r //显示内容为origin/Androidorigin/mesa-esorigin/mesa-es-dri 如git checkout origin/Android 是不会clone远程的内容(也是错误做法) ------------------------

git查看各个branch之间的关系

1.pull所有branch for remote in `git branch -r `; do git branch --track $remote; done for remote in `git branch -r `; do git checkout $remote ; git pull; done 2.查看branch之间关系 git log --graph --all --decorate --simplify-by-decoration --oneline branch - Tr

The current branch is not configured for pull No value for key branch.master.merge found in configur

github虽说挺好用,但对于新手来说,还是个噩梦,比如说对我- - ,搞得乱七八糟,还把之前用来爬微博数据的爬虫给搞没了这个问题是在Myeclispe 中,右键项目 team 选择pull时报错的,国内很多人都有各自乱七八糟的解答,没几个能用的在Stackoverflow找到了答案,原题地址 http://stackoverflow.com/questions/8820668/the-current-branch-is-not-configured-for-pull-no-value-fo

Deleting remote master branch, refused due to being current branch

git - Deleting remote master branch, refused due to being current branch - Stack Overflow In the settings block on the options tap in the settings page (well, just click on the Settings tab on your github repo page), you are able to change the defaul

Git Step by Step – (5) Git分支(branch)

在前面两盘文章中介绍了Git的基本原理,都是理论知识.这篇文章我们再次回到实践中,看看Git分支(branch)的使用. 在代码版本控制工具中,都会有branch的概念.刚开始建立版本仓库的时候,我们只有一个主分支(master branch),我们不可能把日常的新功能开发.代码优化以及bug修复等概念工作全都放在主分支上,这样会使主分支很难维护.这就是为什么会有branch. 分支的创建及删除分支的创建在Git中,branch的创建很简单,我们可以通过下面的命令创建一个"release-1

git:解决The current branch is not configured for pull No value for key branch.master.merge found in config

网上多半都是命令行下的解决方案,我用的是EGit,所以要在eclipse里(我的版本是kepler)把下面这句话添加到配置文件中. Window->Preference->Team->Git->Configuration->Repository Settings->选择你的repository,然后点open [branch "master"] remote = origin merge = refs/heads/master 第二种 1.在本地

解决The current branch is not configured for pull No value for key branch.master.merge found in config

git branch用法总结

git branch 不带参数:列出本地已经存在的分支,并且在当前分支的前面加“*”号标记 git branch -r 列出远程分支 git branch git branch 不带参数:列出本地已经存在的分支,并且在当前分支的前面加“*”号标记,例如: #git branch* master newbranch git branch -r 列出远程分支,例如: #git branch -r m/master -> origin_apps/m1_2.3.4 orig

Android Studio中git新建远程（remote）branch？

新建远程branch有两种方式: 方式一:命令行 git push origin <branch-name>,branch-name就是你要新建的远程branch的名称.你可以用git bash或者Android Studio中的Terminal敲命令行. 方式二:直接通过Android Studio来创建远程branch,很简单,一步就可以了.我直接上图: 下面图中你看到远程的branch就两个:master和nick 接下来,我Push我当前的branch到远程,看下图红线框起来的地方,

git merge branch

git branch look at your branches git branch newbranch git checkout newbrach do something git checkout master git merge newbranch git branch -d newbrach git merge branch,布布扣,bubuko.com