<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; color: rgb(0, 0, 0); font-size: 14px; font-family: Calibri, sans-serif; ">
<div>
<div>
<div>can you run</div>
<div><br>
</div>
<div>git status</div>
<div><br>
</div>
<div>and send me the message?</div>
<div><br>
</div>
<div><br>
</div>
<div>
<div>
<div style="color: rgb(0, 0, 0); "><font class="Apple-style-span" color="rgb(0, 0, 0)" face="Apple Chancery"><i>Diane</i></font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; color: rgb(0, 0, 0); ">
<font class="Apple-style-span" color="rgb(0, 0, 0)"><i>----------------------------------------------</i></font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; color: rgb(0, 0, 0); ">
<font class="Apple-style-span" color="rgb(0, 0, 0)">Diane Fleming</font></div>
<div style="font-family: Calibri, sans-serif; font-size: 14px; ">
<div style="color: rgb(0, 0, 0); ">Software Developer II - US</div>
</div>
diane.fleming@rackspace.com</div>
<div>Cell 512.323.6799</div>
<div>Office 512.874.1260<br>
<span class="Apple-style-span" style="font-family: Calibri, sans-serif; ">
<div style="font-family: Calibri, sans-serif; font-size: 14px; ">
<div style="color: rgb(0, 0, 0); ">Skype drfleming0227</div>
<div style="color: rgb(0, 0, 0); ">Google-plus diane.fleming@gmail.com</div>
</div>
</span></div>
</div>
</div>
</div>
<div><br>
</div>
<span id="OLK_SRC_BODY_SECTION">
<div style="font-family:Calibri; font-size:11pt; text-align:left; color:black; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none; PADDING-BOTTOM: 0in; PADDING-LEFT: 0in; PADDING-RIGHT: 0in; BORDER-TOP: #b5c4df 1pt solid; BORDER-RIGHT: medium none; PADDING-TOP: 3pt">
<span style="font-weight:bold">From: </span>Kersten J Richter <<a href="mailto:kersten@us.ibm.com">kersten@us.ibm.com</a>><br>
<span style="font-weight:bold">Date: </span>Thursday, October 24, 2013 1:07 PM<br>
<span style="font-weight:bold">To: </span>"<a href="mailto:openstack-docs@lists.openstack.org">openstack-docs@lists.openstack.org</a>" <<a href="mailto:openstack-docs@lists.openstack.org">openstack-docs@lists.openstack.org</a>><br>
<span style="font-weight:bold">Subject: </span>[Openstack-docs] resolving git review conflicts<br>
</div>
<div><br>
</div>
<div>
<div>
<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><br>
<br>
<font size="2" face="sans-serif">Attempting to fix my last commit message for this review: <a href="https://review.openstack.org/#/c/48573/">https://review.openstack.org/#/c/48573/</a></font><br>
<br>
<font size="2" face="sans-serif">Everything is fine until I hit git review -v</font><br>
<br>
<font size="2" face="sans-serif">Then I get a message that Automatic cherry pick failed.</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git checkout master</font><br>
<font size="2" face="sans-serif">Switched to branch 'master'</font><br>
<font size="2" face="sans-serif">Your branch is ahead of 'origin/master' by 2 commits.</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git remote update</font><br>
<font size="2" face="sans-serif">Fetching origin</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git pull origin master</font><br>
<font size="2" face="sans-serif">From git://github.com/openstack/object-api</font><br>
<font size="2" face="sans-serif"> * branch master -> FETCH_HEAD</font><br>
<font size="2" face="sans-serif">Already up-to-date.</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -d 48573</font><br>
<font size="2" face="sans-serif">Downloading refs/changes/73/48573/1 from gerrit into review/kersten_richter/bug/1214139</font><br>
<font size="2" face="sans-serif">Branch already exists - reusing</font><br>
<font size="2" face="sans-serif">Switched to branch 'review/kersten_richter/bug/1214139'</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git commit -a --amend</font><br>
<font size="2" face="sans-serif">[review/kersten_richter/bug/1214139 6180e4a] Added Header files section to overview.</font><br>
<font size="2" face="sans-serif"> 1 files changed, 220 insertions(+), 109 deletions(-)</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -v</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.313755 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.319399 Running: git remote</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.323764 Running: git branch -a --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.330512 Running: git branch --color=never</font><br>
<font size="2" face="sans-serif">Found topic 'bug/1214139' from parsing changes.</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.335430 Running: git rev-parse --git-dir</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:00.340200 Running: git remote update gerrit</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">2013-10-24 13:02:02.549872 Running: git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Automatic cherry-pick failed. After resolving the conflicts,</font><br>
<font size="2" face="sans-serif">mark the corrected paths with 'git add <paths>', and</font><br>
<font size="2" face="sans-serif">run 'git rebase --continue'</font><br>
<font size="2" face="sans-serif">Could not apply 6180e4a... Added Header files section to overview.</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"># Unmerged paths:</font><br>
<font size="2" face="sans-serif"># (use "git reset HEAD <file>..." to unstage)</font><br>
<font size="2" face="sans-serif"># (use "git add/rm <file>..." as appropriate to mark resolution)</font><br>
<font size="2" face="sans-serif">#</font><br>
<font size="2" face="sans-serif"># both modified: openstack-object-storage-dev/ch_object-api-general.xml</font><br>
<font size="2" face="sans-serif">#</font><br>
<font size="2" face="sans-serif">no changes added to commit (use "git add" and/or "git commit -a")</font><br>
<br>
<font size="2" face="sans-serif">Running git commit -a gives me this:</font><br>
<br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git commit -a</font><br>
<font size="2" face="sans-serif">[detached HEAD 838f351] Added Header files section to overview.</font><br>
<font size="2" face="sans-serif"> 1 files changed, 223 insertions(+), 96 deletions(-)</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ git review -v</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.422824 Running: git log --color=never --oneline HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.428496 Running: git remote</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.432687 Running: git branch -a --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.439132 Running: git branch --color=never</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.444015 Running: git log HEAD^1..HEAD</font><br>
<font size="2" face="sans-serif">Found topic 'master' from parsing changes.</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.452316 Running: git rev-parse --git-dir</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:07.456883 Running: git remote update gerrit</font><br>
<font size="2" face="sans-serif">Fetching gerrit</font><br>
<font size="2" face="sans-serif">2013-10-24 13:07:09.619359 Running: git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Errors running git rebase -i remotes/gerrit/master</font><br>
<font size="2" face="sans-serif">Interactive rebase already started</font><br>
<font size="2" face="sans-serif">[kersten@oc6256675768 object-api]$ </font><br>
<br>
<font size="2" face="sans-serif">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><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></p>
</div>
</div>
</span>
</body>
</html>