Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cdt-dev] LLVM/Clang toolchain broken

Hi Joost, 

Gerrit has a bit of a learning curve. Generally speaking there is no merges in gerrit workflow - instead you cherry-pick changes between the branch.

The basic steps here are:
1) Checkout master branch
2) Cherry-pick your change from your working branch
3) Submit to gerrit. 

I generally use git command line, so I am not as familiar with the eGit (Eclipse Git Integration) tools. But at the command line I would do this:

git fetch origin
git checkout origin/master -b bug535565_try2
git cherry-pick bug535565
git push origin HEAD:refs/for/master

Later when you are doing updates based on review feedback, you will amend and repush your commit:

# make edits
git add changed files
git commit --amend --signoff
git push origin HEAD:refs/for/master


Jonah Graham
Kichwa Coders

On Sun, 19 Jan 2020 at 12:37, Joost Kraaijeveld <J.Kraaijeveld@xxxxxxxxxx> wrote:
On Sat, 2020-01-18 at 14:21 -0500, Jonah Graham wrote:
> I will need to review
> the patch to see what is best. So the next step would be to submit
> the contribution via Gerrit. See
> for step-by-
> step instructions and come back to me if anything isn't clear enough.
Following the procedure I am at a point that I have to resolve merge
conflicts with master. I thinks it's because I rebased with master but
I did not pay enough attention to what I really did as I was slavishly
following the instructions.

Should I really rebase to master if I forked from CDT_9_10_ (..but it
should have the latest code (rebased to master)...)?
If so, is it correct that I cannot merge master into my branch but that
I have to merge my branch into master, which is the only thing Eclipse
seems to allow?

Sorry, I really feel helpless with this procedure... And that after >
30 years of software development.


Joost Kraaijeveld
Hommelseweg 123
6821 LD Arnhem

cdt-dev mailing list
To change your delivery options, retrieve your password, or unsubscribe from this list, visit

Back to the top