* pushing rewritten scratch branch
@ 2019-04-25 23:42 Stephen Leake
2019-04-26 0:04 ` Dmitry Gutov
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Leake @ 2019-04-25 23:42 UTC (permalink / raw)
To: emacs-devel
I have a scratch branch scratch/project-uniquify-files, that I'm having
trouble pushing.
I wanted to squash the commits so it would be easier to review, but I
had done 'merge' from master instead of 'rebase'.
So I extracted a diff from master, reverted the branch to master with
'git reset --hard master', applied the diff, and committed.
Now I'm trying to do 'git push', but it's rejected because it's not a
"fast-forward" commit.
Following 'git push --help', I tried to override that with:
git push origin +scratch/project-uniquify-files:scratch/project-uniquify-files
But that gave the same error.
How do I fix this?
I think I can delete the remote branch and recreate it, but it seems
like there ought to be an easier way.
--
-- Stephe
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: pushing rewritten scratch branch
2019-04-25 23:42 pushing rewritten scratch branch Stephen Leake
@ 2019-04-26 0:04 ` Dmitry Gutov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Gutov @ 2019-04-26 0:04 UTC (permalink / raw)
To: Stephen Leake, emacs-devel
On 26.04.2019 2:42, Stephen Leake wrote:
> I think I can delete the remote branch and recreate it, but it seems
> like there ought to be an easier way.
Alas, it's exactly what we do.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-26 0:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-25 23:42 pushing rewritten scratch branch Stephen Leake
2019-04-26 0:04 ` Dmitry Gutov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).