[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] How to get one gerrit change into local branch
|
this works fine...but if i want to push my changes into gerrit I get an error message that i should squash my changes.
I think this is because I have more than one commit (one for the merge, one for the change I have done)?
How do I do this?
Thorsten
On Tue, Jan 4, 2011 at 5:39 PM, Shawn Pearce
<spearce@xxxxxxxxxxx> wrote:
On Tue, Jan 4, 2011 at 06:16, Thorsten Kamann
<
thorsten.kamann@xxxxxxxxxxxxxx> wrote:
> I want to edit a change from gerrit on a second workstation. For this I have
> clone the egit repository. From this master I've created a local branch.
> How can I merge the gerrit change in this branch? Can this be done with
> egit?
> Gerrit-Change:
http://egit.eclipse.org/r/#change,2155
from Gerrit's URL, but in the fetch refspecs you need to copy
refs/changes/55/2155/7 into some local branch on your repository (e.g.
refs/remotes/gerrit/2155). After that is fetched, do a reset hard to
that commit.
Gerrit has some of these actions as C Git command lines you can copy
and paste, on the start of those lines you can get the URL and the
refs/changes/... string for the given patch set you are interested in.
Since these sorts of lines are so common in the Git world, it might
help if EGit had a "Pull" dialog that just accepted a "git pull URL
REF" syntax and parsed it all for you. Sadly, I don't think we have
that yet.
--
Shawn.
--
Thorsten Kamann
Software-Architect, Consultant, Coaching
Germany, NRW
Business:
itemis products and solutions GmbH & Co. KG | Heinrichstraße 51 | 44536 Lünen
Rechtlicher Hinweis:
Amtsgericht Dortmund, HRA 15841
P.h.G.: Komplementär: itemis management GmbH | Amtsgericht Dortmund HRB 18939 | Geschäftsführer Jürgen Rödl
Personal:
thorsten.kamann@xxxxxxxxxxxxxx
http://www.thorsten-kamann.de/callto://thorque
Fornax-Platform - Platform for developing MDSD-related Tools and components
http://www.fornax-platform.org/
