RESOLVED DUPLICATE of bug 3885238274
webkit-patch should suggest updating to trunk 
https://bugs.webkit.org/show_bug.cgi?id=38274
Summary webkit-patch should suggest updating to trunk
Evan Martin
Reported 2010-04-28 11:09:49 PDT
$ git checkout HEAD~6 # or some other thing that gets you in this state $ hack hack hack $ webkit-patch upload MYBUGNUM Are you sure you want to continue? [Y/n]: There are 6 local commits and working copy changes. Do one of the following: 1) Use --squash or --no-squash 2) git config webkit-patch.squash true/false There are 6 local commits and working copy changes. Do one of the following: 1) Use --squash or --no-squash 2) git config webkit-patch.squash true/false ==== So (a) the error message is confusing (I don't have 6 local commits), and (b) it could perhaps suggest rebasing onto origin or whatever.
Attachments
Add attachment proposed patch, testcase, etc.
Ojan Vafai
Comment 1 2010-05-17 16:11:56 PDT
Slightly different symptoms, but same root cause as 38852. *** This bug has been marked as a duplicate of bug 38852 ***
Note You need to log in before you can comment on or make changes to this bug.