egit

EGit Local vs. Remote repositories

一曲冷凌霜 提交于 2019-11-29 23:05:42
问题 I'm new to git and am wrapping my head around how I'm supposed to be using git and egit. From the egit tutorial, I have setup a respository on GitHub, pushed my Eclipse projects to the remote GitHub repository from my local workspace, I can push changes to GitHub, switch branches, see the updates on GitHub, etc. This all makes sense. Looking at the Git Repository explorer, I have a listing of "Local" branches and have no "Remote Tracking" branches and I have no "Remotes" listed. When I create

EGit and Eclipse modifies .gitignore file but it should not

这一生的挚爱 提交于 2019-11-29 22:06:25
I'm using Eclipse and EGit, but Eclipse modifies my .gitignore file without me asking to do so. As soon as I open Eclipse the .gitignore file is modified. I've added some folders to .gitignore (through EGit) but removed them after, but Eclipse keeps adding removed lines to .gitignore . git checkout .gitignore , I get the good version of the file Then I go to Eclipse window Then I go back to terminal and issue: git status , I can see that .gitignore is now modified. How can it be? robinst By default, EGit automatically adds resources marked as "Derived" to .gitignore . A typical example is the

Can't install Maven SCM Handler for EGit for Juno

别等时光非礼了梦想. 提交于 2019-11-29 20:44:22
I've updated my eclipse indigo to juno via the Help->Check for updates menu. I noticed I had updates for egit (2.x) and jgit (2.x) which clashed with my current installations (1.3.x) and so I removed all my egit plugins (eigt,jgit,egit-mylyn and Maven SCM Handler for EGit). I then tried to install the above egit plugins and was able to install egit and jgit but was unable to install Maven SCM Handler for EGit. I tried updating grvia the m2e marketplace and got the following error: Cannot complete the install because of a conflicting dependency. Software being installed: Maven SCM Handler for

Can't clone remote git repository with EGit

南楼画角 提交于 2019-11-29 20:22:17
I am trying to clone remote git repository with Egit, via https protocol. I followed this online tutorial . When I insert URI: https://username@host:port/repositorypath , password and click NEXT, I am getting this error message: Cannot list the available branches. Reason: Exception caught during execution of ls-remote command. How can I clone this repo? Daniel Lee It sounds like Egit is looking for an ssl certificate and refusing to function without it. A good fix to make the problem go away and stay away: Window→Preferences→Team→Git→Configuration→New Entry→ http.sslverify = false . That

How to resolve conflicts in EGit

五迷三道 提交于 2019-11-29 19:05:21
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 caught during execution of add command Hard reset An internal error occurred during: "Resetting to refs

Eclipse使用EGit管理git@OSC项目

眉间皱痕 提交于 2019-11-29 18:39:38
Git是当前最流的行分布式版本控制工具,而作为最主流的(没有之一)Java开发工具Eclipse以插件的形式对其提供了支持,那就是Egit。这里介绍一下我使用Eclipse的EGit管理Git远程项目的过程。当然,这可能不是最佳实践,但是通过我的验证这么做的确是没有问题的。网上得来终觉浅,绝知此事要躬行。 预备 : 系统环境:Windows XP/Windows8.1 安装Eclipse:怎么做不用我再说了吧 安装 Egit:我这里使用的是Eclipse Kepler,已经自带EGit插件,无需安装。 Kepler 之前的版本可以自行安装 Egit插件,你可以通过Eclipse Marketplace、Install New Software、手动下载使用link、或者直接放进插件目录等方式安装。 预备工作完成, 不需要再安装任何东西了 。 第一步:配置环境 配置Git(Egit): 设置Git HOME:需要在系统环境变量中为Git提供一个HOME路径。这个目录将用于保存git的配置文件和默认的本地仓库。我这里使用的是F:\GitHome,当然你可以设置系统盘的任意路径。 配置git用户信息:在eclipse 》Preferences 》Git 》Configuration 选项中配置git用户信息

“git pull --rebase” in Eclipse

南楼画角 提交于 2019-11-29 17:32:30
问题 Our version control manager recommends us to use git pull --rebase to pull new changes from upstream branch. I want to use EGit (Eclipse plugin for git) to execute that. How can I do this? 回答1: Use git config branch.*branch-name*.rebase true And pull will automatically rebase. You can set it up to configure new branches automatically. git config branch.autosetuprebase always 回答2: You can also change the rebase configuration of a branch from within Eclipse: Open the Git Repositories view and

Git packfile is truncated

烂漫一生 提交于 2019-11-29 14:06:08
When trying to pull using EGit with Eclipse I randomly get the error: packfile is truncated I don't know how and why this occurs. Even importing the project again doesn't help. What's the problem here? I had the same error and recognized that it always occured when I tried to import in Eclipse while having the local git repository (the directory the repository is going to be copied into) open. So just closing the file browser and importing again solved my problem. This problem could possibly be caused by not having enough space to create the pack files, so make sure you are not hitting any

How do I create a remote git repository in EGit and link it to an existing Eclipse project?

元气小坏坏 提交于 2019-11-29 11:30:17
问题 I am using Eclipse Helios and EGit. I am new to Git. I have an existing Eclipse project for an Android app I would like to place in Git. Can someone please share some instructions on how to setup a Git repo on a shared folder, and place the existing project into this git repo using EGit? I have tried a variety of options with no success. Thanks! 回答1: I had the same question (how to do it in Eclipse / eGit), and I just found the answer to the question stated in the title : go in Window > Show

What does the option “Auto share projects located in git repository” of EGit mean?

家住魔仙堡 提交于 2019-11-29 10:48:53
问题 Every time I import a maven project. Among the remaining tasks to be done always appears Auto share git project (waiting) . I dig in the web and I just find where enable/disable the option, but I want to understand what is doing and if I need it. What I always do is create/clone the project in command line and then import it in Eclipse, then I can do all the git work in EGit. Is the Auto share projects located in git repository option necessary in this scenario or I can disable it? 回答1: In