38274 2010-04-28 11:09:49 -0700 webkit-patch should suggest updating to trunk 2010-05-17 16:11:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED DUPLICATE 38852 P2 Normal --- 1 evan webkit-unassigned ojan oldest_to_newest 218499 0 evan 2010-04-28 11:09:49 -0700 $ 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. 226967 1 ojan 2010-05-17 16:11:56 -0700 Slightly different symptoms, but same root cause as 38852. *** This bug has been marked as a duplicate of bug 38852 ***