| Help: My Push was rejected [message #896312] |
Tue, 17 July 2012 22:34  |
 Jaxim Flash
Messages: 8
Registered: June 2011 |
Junior Member |
|
|
I am attempting to push some committed changes, but it's getting rejected with the following message:
master:master [rejected - non-fast-forward]
I synchronized and discover that a few remote files conflict with some of my committed local files. So I attempt to accept the remote file by performing any of the following actions: "Overwrite", "Merge", "Marked as Merged". However, none of those actions seems to do anything. The files still show up as being in conflict.
I also attempted to perform a "pull", but that too also produces an error. Within the Pull window, the "fetch result" states "No ref to fetch from origin - everything up to date". The "Update Result" states "Failed".
I am obviously a relatively new user to git and egit, so I would appreciate any help in what I should do to resolve the conflicts so I can upload my changes.
thanks!
Jack
[Updated on: Tue, 17 July 2012 22:45] Report message to a moderator |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| Re: Help: My Push was rejected [message #996372 is a reply to message #991612] |
Tue, 01 January 2013 18:07  |
Robin Rosenberg
Messages: 266
Registered: July 2009 |
Senior Member |
|
|
David Coates skrev 2012-12-19 22.29:
> When I try to do an EGit Pull, I get the Pull Result dialog box that says, "Fetch Result No ref to fetch from origin - everything up to date." However, it's not up to date.
> Update Result says Result Failed and there are two updates listed in the Merge input area. Also the error Log shows a java.lang.ArrayIndexOutOfBoundsException with the
> following session Data: eclipse.buildId=3.1.0.201210061306-RELEASE-e42
> java.version=1.7.0_05
> java.vendor=Oracle Corporation
> BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
> Framework arguments: -product org.springsource.ggts.ide
> Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.springsource.ggts.ide
The Eclipse/JRE version information can't hurt but it rarely helps. What often does help
is the stack trace of an error, if there is one and. The version of the EGit plugin is sometimes
helpful.
The latest release, 2.2, of EGit contains a bug fix that may cause bogus merge failures, which in turn are
not reported in a way that is helpful to a user, so please try it out. I would not expect an
ArrayOutOfIndexException here, so it might be something we do not know about.
The reporting issue is not fixed in 2.2, but hopefully it'll be in a nighly build.
Look for https://git.eclipse.org/r/#/c/9386
-- robin
|
|
|
|
| Re: Help: My Push was rejected [message #1014944 is a reply to message #1001944] |
Tue, 26 February 2013 16:59 |
Abby Bader
Messages: 3
Registered: February 2013 |
Junior Member |
|
|
Jack,
My team had this problem a lot. The workflows that work with git and eGit seem to be:
EITHER:
1) commit local changes
2) pull changes (merge is automatic)
3) resolve any merge conflicts, ADDING files once the conficts are resolved
OR:
1) stash local changes
2) pull changes (no merge is needed)
3) apply stashed changes
4) verify that you haven't overwritten any pulled changes, because there's a bug in the current release of eGit
Both of these workflows should get you to a state where you can either continue working or commit if you're ready. The former is easier to do, so if you happen to be ready to commit -- do it.
Takeaway: Always commit or stash before you try to pull.
I agree that git seems to be harder, conceptually. I'm not in love with it, but it's what my team is using. I have high hopes that the plugin will continue to improve, now that the Eclipse devs are using it. (Right?)
|
|
|
Powered by
FUDForum. Page generated in 0.02082 seconds
] 
Search
Help
Register
Login
Home
).