[Tizen Application-dev] Gerrit patch

Harmon, Barbara bharmon at jaguarlandrover.com
Wed Mar 4 22:44:27 GMT 2015


Hello Gerrit users,

Apologies, if this just isn't the right type of request for this mailing
list...please ignore if so. Graphics person alert...

I've got a slight patch issue and I'm wondering if anyone would like to
shed some enlightenment.

Here is the sequence of events:
1. Created code on a branch and realized that part of the code from a
co-worker was missing
2. Pulled once the code was merged into the repo, saw the change reflected
there
3. Pushed the branch to Gerrit for review
4. Upon self-review, the missing code had not pushed up
5. Patched the branch, using "git commit --amend", and edited the commit
message, adding the Change-Id of the review
6. Received error that the "! [remote rejected HEAD -> refs/for/master
(squash commits first)", and "error: failed to push some refs to 'ssh://"...

I have done a search on this and read about patches in Gerrit, but am not
seeing a particular explanation for why I'm getting the error and
apparently being asked to squash commits. Usually I add changes to a review
shortly after I've created it, and it often goes straight to the review
magically, not requiring extra effort from me unless it's been more than a
few hours.

Thanks!

-- 
*Barbara Harmon*
Graphics Developer - Infotainment

*T:* 1.971.256.9733 X1033
*Email:* bharmon at jaguarlandrover.com <fgraham at jaguarlandrover.com>



Jaguar Land Rover North America, LLC
1419 NW 14th Ave, Portland, OR 97209
-------------------
Business Details:
Jaguar Land Rover Limited
Registered Office: Abbey Road, Whitley, Coventry CV3 4LF
Registered in England No: 1672070

This e-mail and any attachments contain confidential information for a
specific individual and purpose.  The information is private and privileged
and intended solely for the use of the individual to whom it is addressed.
If you are not the intended recipient, please e-mail us immediately.  We
apologise for any inconvenience caused but you are hereby notified that any
disclosure, copying or distribution or the taking of any action in reliance
on the information contained herein is strictly prohibited.

This e-mail does not constitute an order for goods or services unless
accompanied by an official purchase order.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.tizen.org/pipermail/application-dev/attachments/20150304/29efcd55/attachment.html>


More information about the Application-dev mailing list