On Tue, Aug 22, 2017 at 5:57 PM, Stefan Beller <sbel...@google.com> wrote:
> On Tue, Aug 22, 2017 at 2:55 PM, Jeffrey Walton <noloa...@gmail.com> wrote:
>> I tested some changes that lead to a dead end. The changes need to be
>> removed. The changes were added in 7 commits.
>>
>> I went back in time to the point before the changes:
>>
>>     $ git reset --hard HEAD~7
>>     HEAD is now at 559fc3b Fix benchmark selection code (GH #464)
>>
>> When I attempted to push:
>>
>>     $ git push
>>     Username for 'https://github.com': noloader
>>     To https://github.com/noloader/cryptopp.git
>>      ! [rejected]        master -> master (non-fast-forward)
>>
>> I tried to commit, but Git claims there's nothing to add:
>>
>>     $ git commit
>>     On branch master
>>     Your branch is behind 'origin/master' by 7 commits, and can be
>> fast-forwarded.
>>
>> Commit seems to be the wrong command as Git appears to be trying to do
>> something I don't want.
>>
>> How do I force the push to succeed?
>>
>> Thanks in advance.
>
> Checkout the --force[-with-lease] argument.

Perfect, thanks.

Jeff

Reply via email to