egit

Egit rejected non-fast-forward

﹥>﹥吖頭↗ 提交于 2019-12-17 17:18:53
问题 I am getting this message while pushing to github repository. Can you tell me step by step procedure to fix it? I pushed only once and it was successful. But, when I updated a project and tried to push my second commit, it shows "master rejected non-fast-forward" and does not allow me to push. Please explain the procedure. 回答1: I had this same problem and I was able to fix it. afk5min was right, the problem is the branch that you pulled code from has since changed on the remote repository.

egit - not authorized

六月ゝ 毕业季﹏ 提交于 2019-12-17 15:23:04
问题 I just connected to GIT from Eclipse Juno using EGit, and successfully cloned a certain remote repository. During the clone I entered my Github username and password, but chose not to save them. Then I tried to "Fetch from Upstream". I got this error: https://github.com/biunlp/nlp-lab.git: not authorized I had no chance of entering my username and password... This is strange since I connected to this repository in order to clone... 回答1: A. To specify credentials individually for each remote

Eclipse + EGit: clone project into workspace

…衆ロ難τιáo~ 提交于 2019-12-17 10:47:40
问题 I'm a little confused about how EGit workes. I have an existing git repository on Github and want to clone it into my workspace. My goal is to have the local repository directly stored inside my workspace-folder but I don't get it working with EGit. When I want to clone the github repo with EGit, I have to choose a directory as destination. The suggested directory is in my homedir (not in my workspace). When I choose this directory I can see the project in Eclipse but it is not stored in my

Eclipse git checkout (aka, revert)

微笑、不失礼 提交于 2019-12-17 08:10:08
问题 Is it possible to do the equivalent of git checkout from within Eclipse using the EGit plugin? I have a file that's been modified. I want to discards the changes and revert the file back to what's in the source repository. In Subversion this is called revert. In git the equivalent is checkout. I can't find any menu item under Team that looks like checkout or revert. I'm using EGit 0.6.0. 回答1: This can be done via the context menu "Replace with/File in Git index" on the file in package view.

How to merge code in Eclipse

余生长醉 提交于 2019-12-14 03:55:32
问题 How do I dot the following in Eclipse? I have created a Android app project in Eclipse and I have put this under version control using eGit and BitBucket (again I don't know if this is the best way to describe it as I'm new to version control). I have written some code and made several commits so far. I have invited a friend who has joined the project. Last night they changed some of the code. Today I fire up Eclipse and want to continue working on the project, but want to start from where

How to revert changes due to a merge with Eclipse and EGit

落爺英雄遲暮 提交于 2019-12-14 03:26:52
问题 I am using Eclipse Mars.1 (4.5.1) with EGit 4.1.0. After a merge from a branch into master, I cannot figure out how to tell EGit to resolve a conflict by simply keeping the version that was in master before the merge, ignoring anything that came into that file as a result of the merge. This is what I do. My Java projects all point to master. No uncommitted changes in any project. In Package Explorer view I right-click a project, click Team, Merge. In the "Merge 'master'" dialog that pops up I

Eclipse/EGit Import From Local Git Repo?

老子叫甜甜 提交于 2019-12-14 02:14:38
问题 I can't seem to figure this out. I keep importing, but I get no files from the repo. I have a local repo that has a grails project that I checked in. Now, I want to get those files out into a new project in eclipse. (Using EGit). I've tried several different ways, but all I ever get is an empty grails project. I can see the source tree with all the sources in it in the git repo browser. Help? 回答1: I usually do this: Import existing projects into Eclipse (could be you have to do some Import

Eclipse with EGit, git-blame info is hard to see

被刻印的时光 ゝ 提交于 2019-12-13 12:23:42
问题 using Eclipse Indigo Service Release 2, with EGit plugin and JDK 1.7. I've seen that it should support blame annotations, but I can't get it to show like I see here on Eclipse Wiki. Here's how it looks for me, you can't see the pointer but I'm hovering over the vertical brown line: Anyone know how to expand the annotations view? 回答1: Right-click on the brown line, Revisions -> Show Author . 来源: https://stackoverflow.com/questions/10208495/eclipse-with-egit-git-blame-info-is-hard-to-see

EGit and multiple “users” on same machine

南楼画角 提交于 2019-12-12 17:03:51
问题 I'd like to work with multiple git-based open source projects from the same machine. For each project, I'd like to associate a differnet user.name and user.email as appropriate. For instance, I might want to work on some project called fizz that is hosted on GitHub, and also work on another project called buzz that has its own privately-hosted, centralized git server/repo. For the fizz project, I'd like to use myname@example.com as my email, so that when I push changes to the master branch,

Can't commit files with Eclipse EGit

孤人 提交于 2019-12-12 16:13:52
问题 Whenever I try to commit a file EGit says "no files to commit", though the file is staged for commit according to its icon in Project Explorer (see the image) This happens to any file in my project. What am I doing wrong? I'm using EGit 0.11.1. EDIT: Updated to 1.2.0 and it worked, thank you all! 回答1: As mentioned by the OP asd, EGit0.11.1 is not the latest version: The Egit 1.2-SNAPSHOT (available through the nightly update site) solves the problem. In general EGit promises to support at