[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Gerrit: merging feature branches
From: Marco Martin <notmart () gmail ! com>
Date: 2014-10-28 18:13:53
Message-ID: 201410281913.54245.notmart () gmail ! com
[Download RAW message or body]
Hi all,
Gerrit question: I have a feature branch in plasma-framework
(mart/basicDeleteUndo), and i wanted to do the review process with gerrit.
now i tried the following 3 approaches, that all fail miserably:
* from my branch: git push gerrit HEAD:refs/for/master gives [remote rejected]
master -> refs/for/master (no new changes)
* from master: git rebase mart/basicDeleteUndo, then git push gerrit
master:refs/for/master . it complains that a commit doesn't have an id (all of
my commits in the branch have it)
* from master: git merge mart/basicDeleteUndo: complains as well that a commit
doesn't have id (may be the merge commit in this case?)
in the end the nearest i could get is
https://gerrit.vesnicky.cesnet.cz/r/#/c/130
Can the feature branch workflow work at all in gerrit or is better to just use
master?
--
Marco Martin
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic