最近在使用github来管理一个项目,但是多地开发的时候,发现pull不好使。原来是要在preference中的Team-git-configuration中添加一个core.remote.url选项,value值为你的github地址
但是这是网上的解决方案,还是没有解决。
但是在调查过程中发现了一个Git的view很重要:Git Repositories;Branches-Remote Tracking,下面可以看到master分支,然后右键-Synchronize workspace(或者切换到Team Synchronizing),然后点击Merge-All小按钮;就可以同步了。
这个时候其实还是有问题,因为下载的东西在本地的库中并没有的,所以还需要提交一下。
git概念
git,尤其是远程服务器git有几种状态:
首先本地工作区(workspace)
其次,add to stage(index),这一步是将内容放置到缓冲区中,但是并没有放置到当前的版本分支中
然后,commit,提交,这个时候才会把内容放置到版本库中,当然可以从workspace中直接放到版本库分支中
之后,remote/push,将代码提交到远程的版本库分支中。
最后,可以通过pull来获得最新版本。pull的时候可能会有异常信息:nothing to fetch,这是因为需要在git中配置一下origin的fetch属性:Windows->Preference->Team->Git->Config->repository Setting(tab)->remote.origin.fetch=+refs/heads/brook:refs/remotes/origin/brook(你的分支的名称)即可。
我使用的是eclipse下面的git,所以在创建分支的时候,会友情提示:如果是pull,是无条件覆盖还是尝试合并,看情况选择吧。我突然明白了为什么git建议留着master不要直接使用,而是创建一个分支出来,其中一个原因是可以在新创建的分支上面做更多的配置;另外一个原因是,留着一个可用的分支版本,不断合并更加健康;因为交付过程中可能需要在开发新的分支的同时来对老版本进行一些调整。
总之你会觉得git强调本地化开发,自成体系,不再受远程版本库的约束。
关于head,origin,master以及branch
head是一个指针,指向当前的工作分支(branch),当你"checkout master",指针指向master;当你"check out branch_name",指针指向branch_name。
origin就是远程库(原始库)根目录的意思。
merge之后要add来标记合并完成,否则一直处于merge状态,无法进行后续操作。
关于Index,Repository
当把修改的文件内容放入到了index之后,再修改文件,就仍然还是在工作空间;修改的内容并不会波及到index,在index域的文件内容是独立于工作空间的;工作空间的内容放入到了Index中,如果同文件,直接覆盖(不会merge)
放入stage的好处在于可以避免一次次的提交,因为每次提交(commit),就意味着需要提交到远程库,如果是太过于琐碎的尝试,可能被推翻,那就向服务器提交次数太多了;所以,stage库称之为缓存区,就是你的一个临时版本库,如果OK在提交到版本库(local repository)。
文件放入到了index,就意味着版本被跟踪了;并且可以提交到本地库(local repository);
文件通过commit放入了本地仓库(local repository),就意味着版本可以提交到远程仓库(remote repository);
文件提交到了远程仓库(remote repository),意味着可以让其他人拉去,共享。
关于revert
习惯于svn的revert,但是在git中没有revert的概念,只有reset,而且是整个工程的reset到指定的版本,不过其实这样想来和revert的内涵也是一致的,只不过revert默认回退到最近的一个版本,git可以指定,另外一个区别就是svn指定文件进行revert,git只能是整个工程进行reset。
reset有三种模式:
Hard,工作空间,Index域,版本库全部回滚到指定版本。这种模式和svn的revert是最相像的。
Soft,版本库回滚到指定版本,a->b->c,reset --soft A,Index域将会是c;这个策略更多的用于打patch,可以少生成一个路径节点的变更,直接生成a->c即可。
Mixed,版本库以及Index域将会回滚到指定版本,但是工作区内容保持,但是状态修改为未添加(add)。
如果是对于单个文件的revert,可以单独选择这个文件,然后replace with...,可以选择本地仓库历史版本,branch,远程库的历史版本等
Eclipse快速创建git库
1. 工程->右键share->Git->将会弹出一个Config Git Repository界面,其中有一个复选框:User or create repository parent foler of project。恩,勾选,这样就会在工程本地创建git文件,这样当前工程就被纳入到git管理了。灰常方便;
![](data:image/png;base64,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)
2. 如果是多个工程,可以选择Top Level Elements为Working Sets模式,然后在顶级文件夹执行第一步,可以一次性将多个工程纳入到git中;或者直接多选项目,然后执行步骤1,等效;
3.如果你不选择复选框,那么就意味着你需要手动指定一个git目录,指定好之后,git将会把当前项目进行剪切,剪切到指定目录下。对于Web工程,这个样的操作就是灾难,因为lib下面的jar还没来得及进行处理,便被生硬的进行了处理,将会导致“WEB App Libraries”下面爆出jar包找不到的异常。
分支
0.创建分支并提交后(客户端创建了一个分支后,需要push一次);
1.要在另外一个客户端中(Eclipse)中的Git repository视图中选中项目,右键->remote->fetch,此时就会在source ref中感知到新的版本,然后选择,Destination ref自动会选择;然后finish;
2.然后继续右键项目->switch to->选择新的分支即可。
作为本地仓库,一定要首先Fetch到这些新的分支信息,然后才能够切换;
pull/Fetch
fetch只是将提交信息同步到本地仓库,并不进行代码合并;
pull则是首先获取代码提交信息,然后是下载代码自动和本地代码进行合并。
关于提交冲突:non-fast-forward
这说明本地的版本和服务器版本不一致,commitId已经过期;这个时候,你最好切换到synchronized试图
- 首先fetch或者pull,从服务器上面获取最新的文件信息;fetch比较友好一些,见上面的说明;
- 对于冲突需要进行解决,这里包括overwrite,服务器覆盖本地,以及可以通过选择“Merge”来进行手工合并;eclipse中的merge工具支持手工动态修改以及可以通过界面操作进行将冲突某个部分修改为服务器版本等操作,十分友好;
- 在视图中右键根节点或者操作对象,add to index,然后提交即可。
git冲突
git提交的时候,发生异常:rejected –non-fast-forward - Freeman的...
这是因为本地版本和数据有冲突,就是本地有的文件,版本库中没有。
如果是已经识别出来了冲突,需要解决冲突,然后make as merge,然后pull,再提交才能够成功;
如果两地文件,旧版本还没有提交到index,且冲突,覆盖本地后,还需要将文件add to index之后,才能够通过pull来解决冲突;
如果通过synchronized windows发现不了冲突,那么冲突时因为本地文件需要更新本地文件需要更新(其实并没有冲突,只是版本低),pull之后,问题可以解决。
non-fast-forward问题本质原因是版本问题;pull的本质是拉取最新版本,然后和本地文件做合并;所以解决的根本方式是将本地的版本提升到最高改版;所以如果是冲突,则解决冲突(marke as merge就是将本地版本提高到高于Remote Repository);如果没有冲突,则说明本地版本比较旧(但是本地的旧版本并没有修改),则需要解决的是本地是最新版本。总之都是要通过pull的方式获取最新的版本;但是对于冲突需要首先手动merge,对于非冲突,自动merge即可。
git解决冲突的正确姿势:解决冲突之后,需要提交commit到本地,然后观察下行箭头,如果减少说明提交是OK的减少了需要pull的对象;如果没有修改完全部的冲突,PUSH是还是报冲突异常,只有全部的冲突都解决了,提交才顺利。
.class文件的冲突后,override之后,提交后仍然是冲突,但是pull一下之后,就OK了。这类(Override)冲突不是提交能够解决的,而是要通过pull来进行处理,因为其实你的提交并没有新的东西,依然无法获取最新;只能够是pull获取服务器代码,进行比对搞定。
开发分支错误,在first_stage开发了半天,怎么办?开始尝试将transfer_stage分支reset为first_stage,但是提交的时候发生异常,工程结构全乱了;后来发现可以采用relace With的方式,指定为替换为first_stage的内容,如此获取到了first_stage分支内容,同时还是在transfer分支最新的代码中修改;
注意完全替换和merge不一样;前者是完全拿来用,后者还会做比对冲突处理,看情况使用。
git管理eclipse工程
工程的资源库应该建立在工程目录的上一级,这样,只需要一个git就可以管理多个工程,而且,如果git放置到了工程目录下,将会导致eclipse提交的时候,连带着把git文件也一并提交,导致隐患。多个工程推荐使用一个git来进行管理。
如果你在.git同级建立项目,会自动被git管理。git会自动管理其同级目录的文件。
文件夹/资源文件/包下只有添加文件了,才会标记为工作空间有值;
ignore文件可以通过Git Repository视图看到(在eclipse 工程将会自动忽略.*文件);也可以到文件目录下找到,可以进行编辑,来屏蔽无关文件夹/文件上传,比如日志文件,/logs/,一行一个即可,但是只能屏蔽未放入到index的文件。
碰到了一个问题:开始没有定义gitignor文件,在push的时候,发现了no-fast-forward,应该是冲突了;结果呢mark as merge之后,我执行了一个动作:add to index,结果把一大堆.class文件放入到了index域中;这样在commit的时候发现了一堆的.class文件;此时我添加了gitignore文件,指定bin下的文件忽略;但是却依然可见这些class文件的提交,这是怎么回事?后来想明白了,是因为这些.class文件都已经放入到了index域了,gitignore只是能够忽略在工作空间的文件。于是在工程中邮件,remove from index,问题解决。
使用Eclipse的git发现了一个很奇怪的现象;就是开始把infrastrution的bin目录提交了;然后在提交的时候,发现大批的.class的冲突;本地库版本上次Push和这次Push之间和远程服务器有了新版本提交;但是其实我是要忽略的这些.class文件的;而且已经在.gitignore文件中增加了屏蔽;尽管已经屏蔽,但是因为远程服务器已经有了bin/*.class文件,于是我提交了.gitignore文件,然后删除了本地的bin文件夹;问题解决了。
找到删除的工程
误删除了taskAccess工程,在git Repository视图的远程分支中”check out“出当前分支,然后误删除工程内容将会在工作空间中出现,标记为删除,然后将这些文件放入到stage中,此时会有一些新的文件在工作空间生成,将其迁移到Staged,此时因为文件齐全,于是项目自动还原。在Eclipse中再次import即可。
可见checkout默认是在当前的工作空间;至于为什么文件放置到staged空间之后,项目就自动回复了,这个还是未解。
删除分支
在Push的页面,通过选择Remove ref to delete的分支,记得点击“add Spec"按钮,即可实现提交
点击Add Spec
Next/Finish即可实现远程分支删除;
删除之后,需要手动将本地的分支删掉(远程分支在本地的Git Repositories视图中将会自动消失)。
删除已经提交的class文件
发现.class文件在工作空间中,而且标志指示该文件曾经提交过(已经入index文件了);此时即使使用.gitignore文件进行指定屏蔽,也无济于事。于是删除掉bin下面所有的文件,此时文件删除被版本控制识别出来,加入stage中然后提交。
再clean工程重新生成class文件,不再识别为待提交文件。
对于已经提交的文件,如果想要屏蔽,一定需要首先删除,然后才能屏蔽;也就是说屏蔽的文件一定是没有放入到index或者已经从index库中删除掉的。
还有一个情况就是一个class文件曾经被别的同学提交过,但是本地已经将其屏蔽了,这个时候就可能会发生纠结,这个冲突怎么也解决不了;解决方案:将屏蔽去掉,然后,生成该class文件;冲突消失,再设置屏蔽,问题解决。
merge禁忌
今天给我的项目组成员搞版本;但是他开始是在笔记本开发,后来打算改到台式机,但是台式机因为代码问题有冲突,我解决了冲突,之后,就手进行了Merge,将台式机版本和develop分支进行了合并;这导致了一个严重的后果:就是笔记本再取最新的时候,导致了一堆的冲突。
尽管来费了很多劲儿才解决冲突,其实没有完全解决冲突,只是冲突不再影响提交。merge一定要在开发人员所在机器上面。
CryInfo.class文件曾经被提交过;.gitignore后来已经屏蔽过了bin文件;解决流程:
1.将被识别为修改了的CryInfo.class文件放入到index区域;
2.物理上删除CryInfo.class文件;
3.再将CryInfo.class文件移除index区域,此时文件呈现为删除状态;再将其放入到index域并提交即可。