[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
[egit-dev] Pushing improved change to Gerrit
|
Hi,
I followed Matthias' excellent write-up of how to change a patch set for
Gerrit (http://dev.eclipse.org/mhonarc/lists/egit-dev/msg00476.html).
Now do whatever changes you want to do, add them to the index and
commit --amend them
(to replace previous version of patch).
Then push the result to Gerrit.
See
http://groups.google.com/group/repo-discuss/browse_thread/thread/44b3afdedd37db6d
why to use fetch / cherry-pick.
In case you start from the branch the first version of your
patchset came from you may as well pull the change,
then you should check for conflicts with upstream changes by doing
"rebase master" from branch 121 and resolve
and amend potentially resulting conflicts (in order not to pollute
the upstream history with merge commits).
--
Matthias
Now I do not know how to push my improved change to gerrit so that it
appears in the corresponding change (http://egit.eclipse.org/r/#change,121).
If someone could post a sample commandline I would be very grateful.
regards
Mihael Vrbanec
--
Mihael Vrbanec | Softwareentwicklung
Softwareschneiderei GmbH | Gerwigstraße 12 | 76131 Karlsruhe | GERMANY
Registergericht: Amtsgericht Mannheim, HRB 109299
Geschäftsführung: Daniel Lindner
Tel.: +49 (0) 721 / 66 388 -08 | Fax.: +49 (0) 721 / 66 388 -09
http://www.softwareschneiderei.de