egit | 易学教程

eclipse中egit插件使用--升级版

阅读更多关于 eclipse中egit插件使用--升级版

首先嘚瑟一下，上一篇博客成为了开源中国代码托管的“帮助”教程，有兴趣的可以在空间里面找一下。习惯使用eclipse做开发，中途也听别人说其他的IDE更好怎么的，去尝试了一下，觉得还是eclipse好，毕竟是IBM出品的。以前使用svn做代码管理，觉得不错，后来使用了开源中国的git代码托管，觉得很赞，但是都是简单的提交、提交，根本没有用其他功能，只是基本一下修改，太大材小用了。有一天突然想尝试一下分支啊、标签啊什么的（据说git就是在这些方面比svn好的），可是网上资料太少了，而且大多数都是命令行的，特别是分支、标签的推送，找不到操作方法，有也只是命令行，最后实在国外的一个网站上找到（曲折中在youtube上看的抓屏）。eclipse用的人很多吧，用egit插件的人也很多吧，可是怎么一搜都会教人安装、提交变更呢，怎么没有更深入的呢，于是我决定写一篇博客，方便后来的人学习egit插件使用，于是就有了开头说的那篇博客。但是写的并不是很全面，内容也是文字少、图片多，虽然说按照步骤来还是可以操作了，但是始终觉得不好，而且还有一些方面没有涵盖到，但是又不好改的（成为教程了，万一改得不如从前了呢），所以就单独写这篇了。好了，铺垫完了，下面开始正题。 1、eclipse和egit版本 eclipse使用的是kepler的SR1版，egit就是自带的那个版本，要详细的话

Git Failed During Push And Now Says Up To Date

阅读更多关于 Git Failed During Push And Now Says Up To Date

问题 I'm using egit with Eclipse and during my commit/push something happened, the push failed and now it says everything is up to date, yet the repo does not have my commit (its not shown in the Github UI) and I can't commit it again because the files that are different it thinks are the same. Output of git status: git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # .DS_Store # runwaysdk-client/.settings/org.eclipse.wst.validation

Eclipse EGIT: Current branch not configred for pull

阅读更多关于 Eclipse EGIT: Current branch not configred for pull

问题 I am working on a tilebased RPG with a friend of mine who has to go away for weeks and we decided it was time to use version control/git. I am starting to regret that. After a few hours we managed to get it working to the point where: I create a repository on github, add him as collaborator. I commit project in eclipse to git, push He pulls, gets it imported in his workspace I make some changes, commit push, he pulls the changes. He makes some changes, commits and pushes successfully. Changes

git gc / git gui: Unlink of file <internal pack file name> failed

阅读更多关于 git gc / git gui: Unlink of file failed

问题 Running version 1.9.4.msysgit.0 of git , I'm getting the mentioned error(s) almost every time I run git gc on the command-line or via git gui when it prompts me to "compress loose objects": Counting objects: 1110956, done. Delta compression using up to 4 threads. Compressing objects: 100% (269562/269562), done. Writing objects: 100% (1110956/1110956), done. Total 1110956 (delta 636114), reused 1110956 (delta 636114) Unlink of file '.git/objects/pack/pack-207f1feb5376880778637c ... 8371cea62

git gc / git gui: Unlink of file <internal pack file name> failed

阅读更多关于 git gc / git gui: Unlink of file failed

How to create a new remote branch with EGit?

阅读更多关于 How to create a new remote branch with EGit?

问题 Let's say I have an Eclipse Project which uses versioning control with EGit and is connected with a remote repository git@myrepo.com:git2013 . In my project, under the local branch newstuff , I create and change some files. Now, I want to push this to a remote branch named newstuff in my remote repository. But my remote repository only holds a branch master . How do I create a new remote branch called newstuff ? PS: Please do not answer with command-line git commands; describe how to do it in

How to resolve conflicts in EGit

阅读更多关于 How to resolve conflicts in EGit

问题 I am using EGit on Eclipse v4.3 (Kepler). I want to commit and push my changes. I do a pull first and one file is conflicting. After manually resolving the conflict (local and remote are the same now), I am still running into problems. Here are the error messages for each action: Push to upstream master: master [rejected - non-fast-forward] Pull Cannot pull into a repository with state: MERGING_RESOLVED Mark as merged Failed to add resource to index Failed to add resource to index Exception

How to do an “ours” merge using the Eclipse git merge tool?

阅读更多关于 How to do an “ours” merge using the Eclipse git merge tool?

问题 I'm trying to do a merge where I have conflicts and one file has diverged massively. The eclipse git merge tool is great for small changes, but one of my files is large and has hundreds of explicitly marked conflicting sections. I can't for the life of me find an easy way to just do a merge using the "ours" strategy of just using my version and abandoning the remote version. On Linux or Mac it would be easy for me to just do it from the command line, but I'm on a corporate Windows computer

Eclipse EGit Not Opening File Comparison

阅读更多关于 Eclipse EGit Not Opening File Comparison

问题 I am using Eclipse (Photon 4.8.0) for a Git project. Before committing, I have been double clicking the files which appear in the unstaged changes section of the Git Staging View to remind myself of what I have changed before writing the commit message (I'm still new to Git so occasionally I will do several things before remembering that I have to commit my changes). However, double clicking on the file today merely opens the file, rather than opening the comparison view . I can still open

eclipse: “re-indexing repository workspace” or “Computing Git status for repository workspace”

阅读更多关于 eclipse: “re-indexing repository workspace” or “Computing Git status for repository workspace”

问题 I am using eclipse Juno, and yesterday I noticed my computer was getting very hot. I checked the CPU usage to see it was at 100%. Eclipse was the culprit, busy "re-indexing repository workspace". When after half an hour it hadn't finished and my machine was nearly melting, I searched and found these similar problems: Re-indexing repository loop - not Maven Eclipse hangs on "Re-indexing (fully) repository {username}" Thing is I'm not using git. And by the sounds of things I don't want to since