<html><body>
<p><font size="2" face="sans-serif">I ran it in the middle. Here it is now:</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git status</font><br>
<font size="2" face="sans-serif"># Not currently on any branch.</font><br>
<font size="2" face="sans-serif">nothing to commit (working directory clean)</font><br>
<br>
<br>
<br>
<font size="2" face="sans-serif">Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: 952-652-5304<br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font><br>
<br>
<img width="16" height="16" src="cid:1__=09BBF69DDFFA17F18f9e8a93df938@us.ibm.com" border="0" alt="Inactive hide details for Diane Fleming ---10/24/2013 02:02:53 PM---can you run git status"><font size="2" color="#424282" face="sans-serif">Diane Fleming ---10/24/2013 02:02:53 PM---can you run git status</font><br>
<br>
<font size="1" color="#5F5F5F" face="sans-serif">From: </font><font size="1" face="sans-serif">Diane Fleming <diane.fleming@rackspace.com></font><br>
<font size="1" color="#5F5F5F" face="sans-serif">To: </font><font size="1" face="sans-serif">Kersten J Richter/Rochester/IBM@IBMUS, "openstack-docs@lists.openstack.org" <openstack-docs@lists.openstack.org>, </font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Date: </font><font size="1" face="sans-serif">10/24/2013 02:02 PM</font><br>
<font size="1" color="#5F5F5F" face="sans-serif">Subject: </font><font size="1" face="sans-serif">Re: [Openstack-docs] resolving git review conflicts</font><br>
<hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br>
<br>
<br>
<font size="2" face="Calibri">can you run</font><br>
<br>
<font size="2" face="Calibri">git status</font><br>
<br>
<font size="2" face="Calibri">and send me the message?</font><br>
<br>
<br>
<font size="2" face="serif"><i>Diane</i></font><br>
<font size="2" face="Calibri"><i>----------------------------------------------</i></font><br>
<font size="2" face="Calibri">Diane Fleming</font><br>
<font size="2" face="Calibri">Software Developer II - US</font><br>
<font size="2" face="Calibri">diane.fleming@rackspace.com</font><br>
<font size="2" face="Calibri">Cell 512.323.6799</font><br>
<font size="2" face="Calibri">Office 512.874.1260</font><br>
<font size="2" face="Calibri">Skype drfleming0227</font><br>
<font size="2" face="Calibri">Google-plus diane.fleming@gmail.com</font><br>
<br>
<font size="2" face="Calibri"><b>From: </b></font><font size="2" face="Calibri">Kersten J Richter <</font><a href="mailto:kersten@us.ibm.com"><font size="2" color="#0000FF" face="Calibri"><u>kersten@us.ibm.com</u></font></a><font size="2" face="Calibri">></font><font size="2" face="Calibri"><b><br>
Date: </b></font><font size="2" face="Calibri">Thursday, October 24, 2013 1:07 PM</font><font size="2" face="Calibri"><b><br>
To: </b></font><font size="2" face="Calibri">"</font><a href="mailto:openstack-docs@lists.openstack.org"><font size="2" color="#0000FF" face="Calibri"><u>openstack-docs@lists.openstack.org</u></font></a><font size="2" face="Calibri">" <</font><a href="mailto:openstack-docs@lists.openstack.org"><font size="2" color="#0000FF" face="Calibri"><u>openstack-docs@lists.openstack.org</u></font></a><font size="2" face="Calibri">></font><font size="2" face="Calibri"><b><br>
Subject: </b></font><font size="2" face="Calibri">[Openstack-docs] resolving git review conflicts</font><br>
<p><font size="2" face="sans-serif">Last one, I swear (at least for a little while). And I'm sure that the change is in object-api this time.</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
Attempting to fix my last commit message for this review: </font><a href="https://review.openstack.org/#/c/48573/"><font size="2" color="#0000FF" face="sans-serif"><u>https://review.openstack.org/#/c/48573/</u></font></a><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
Everything is fine until I hit git review -v</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
Then I get a message that Automatic cherry pick failed.</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
[kersten@oc6256675768 object-api]$ git checkout master<br>
Switched to branch 'master'<br>
Your branch is ahead of 'origin/master' by 2 commits.<br>
[kersten@oc6256675768 object-api]$ git remote update<br>
Fetching origin<br>
Fetching gerrit<br>
[kersten@oc6256675768 object-api]$ git pull origin master<br>
>From git://github.com/openstack/object-api<br>
* branch master -> FETCH_HEAD<br>
Already up-to-date.<br>
[kersten@oc6256675768 object-api]$ git review -d 48573<br>
Downloading refs/changes/73/48573/1 from gerrit into review/kersten_richter/bug/1214139<br>
Branch already exists - reusing<br>
Switched to branch 'review/kersten_richter/bug/1214139'<br>
[kersten@oc6256675768 object-api]$ git commit -a --amend<br>
[review/kersten_richter/bug/1214139 6180e4a] Added Header files section to overview.<br>
1 files changed, 220 insertions(+), 109 deletions(-)<br>
[kersten@oc6256675768 object-api]$ git review -v<br>
2013-10-24 13:02:00.313755 Running: git log --color=never --oneline HEAD^1..HEAD<br>
2013-10-24 13:02:00.319399 Running: git remote<br>
2013-10-24 13:02:00.323764 Running: git branch -a --color=never<br>
2013-10-24 13:02:00.330512 Running: git branch --color=never<br>
Found topic 'bug/1214139' from parsing changes.<br>
2013-10-24 13:02:00.335430 Running: git rev-parse --git-dir<br>
2013-10-24 13:02:00.340200 Running: git remote update gerrit<br>
Fetching gerrit<br>
2013-10-24 13:02:02.549872 Running: git rebase -i remotes/gerrit/master<br>
Errors running git rebase -i remotes/gerrit/master<br>
Automatic cherry-pick failed. After resolving the conflicts,<br>
mark the corrected paths with 'git add <paths>', and<br>
run 'git rebase --continue'<br>
Could not apply 6180e4a... Added Header files section to overview.</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
[kersten@oc6256675768 object-api]$ git status<br>
# Not currently on any branch.<br>
# Unmerged paths:<br>
# (use "git reset HEAD <file>..." to unstage)<br>
# (use "git add/rm <file>..." as appropriate to mark resolution)<br>
#<br>
# both modified: openstack-object-storage-dev/ch_object-api-general.xml<br>
#<br>
no changes added to commit (use "git add" and/or "git commit -a")</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
Running git commit -a gives me this:</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
[kersten@oc6256675768 object-api]$ git commit -a<br>
[detached HEAD 838f351] Added Header files section to overview.<br>
1 files changed, 223 insertions(+), 96 deletions(-)<br>
[kersten@oc6256675768 object-api]$ git review -v<br>
2013-10-24 13:07:07.422824 Running: git log --color=never --oneline HEAD^1..HEAD<br>
2013-10-24 13:07:07.428496 Running: git remote<br>
2013-10-24 13:07:07.432687 Running: git branch -a --color=never<br>
2013-10-24 13:07:07.439132 Running: git branch --color=never<br>
2013-10-24 13:07:07.444015 Running: git log HEAD^1..HEAD<br>
Found topic 'master' from parsing changes.<br>
2013-10-24 13:07:07.452316 Running: git rev-parse --git-dir<br>
2013-10-24 13:07:07.456883 Running: git remote update gerrit<br>
Fetching gerrit<br>
2013-10-24 13:07:09.619359 Running: git rebase -i remotes/gerrit/master<br>
Errors running git rebase -i remotes/gerrit/master<br>
Interactive rebase already started<br>
[kersten@oc6256675768 object-api]$ </font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
I've tried so many different things at this point that I'm a little scared to look at my history. Anyone make heads or tails of this?</font><font size="2" face="Calibri"><br>
</font><font size="2" face="sans-serif"><br>
Kersten J. Richter<br>
Software Engineer<br>
IBM, Rochester<br>
Home office: 952-652-5304<br>
<br>
If you lend someone $20 and never see that person again, it was probably worth it.</font>
<p></body></html>