Hi, Whether you merge immediately or later all 3 changes at the same time is really up to you. If you do merge individually then you have to rebase your branch once the first change was merged (git pull --rebase origin dev). Once you have rebased git will not attempt to push the already closed (and merged) commit anymore as it knows that the remote branch already contains the first commit from your feature branch.
-- Alex ________________________________________ From: development-bounces+alexander.blasche=digia....@qt-project.org [development-bounces+alexander.blasche=digia....@qt-project.org] on behalf of Mandeep Sandhu [mandeepsandhu....@gmail.com] Sent: Monday, October 21, 2013 15:03 To: development@qt-project.org Subject: [Development] Question on Gerrit workflow Hi All, I have a newbie question on our Gerrit workflow. Suppose a change I'm working on is split across 3 commits. Each commit implements a part of the functionality of the change. Once I get approval for a particular changeset, should I merge it to staging immediately or wait for approval for all 3 and then stage them 1 by 1? In my case I want to merge as early as possible so that CI can catch any build errors for some of the platforms I've not tested the code on. The issue I faced was that while pushing one of my changesets, I started seeing faliures because my previous changeset, which was approved and merged to staging, was marked as closed and my push was trying to push the same change again. $ git push gerrit HEAD:refs/for/dev ... ... ! [remote rejected] HEAD -> refs/for/dev (change 66701 closed) ... (Here 66701 was merged already) How do I handle this? Should I do a 'Revert Change' for the merged changeset so that I can push again? Please bear with me if I've overlooked something obvious, but I'm just learning Gerrit ropes! :) -mandeep _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
