From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
Subject: Re: Stash
Date: Sun, 05 Apr 2015 20:31:07 +0200 [thread overview]
Message-ID: <86sice77h0.fsf@dod.no> (raw)
In-Reply-To: E1YeoZK-00083r-8C@fencepost.gnu.org
>>>>> Richard Stallman <rms@gnu.org>:
> When people told me that my changes in Lisp files did not get pushed,
> I did git pull again, and it told me there was a problem
> lisp/ChangeLog again, but there was no conflict in it.
> Then I did git commit again.
Hm... that may not have been enough? Did you stage lisp/ChangeLog before
before doing the commit? Ie.
git add lisp/ChangeLog
git commit
If you didn't and this was marked as a merge, the commit probably didn't
happen.
> Then I did git push again, and got this.
> To rms@git.sv.gnu.org:/srv/git/emacs.git
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'rms@git.sv.gnu.org:/srv/git/emacs.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
> I have no idea what that means.
It means someone else pushed since your last pull. Try doing a new
pull, followed by a push.
git pull
git push
>> My guess would be that these are still stashed, and need to be
>> unstashed and then pushed.
> How can I tell?
> And if those changes are stashed, why did they show up in git diff?
Don't have enough context to say anything here, sorry.
> Anyway, I did 'git stash pop' to see if they were stashed.
> That seems to have changed dozens of files.
> 'git diff origin/master' gave me 5000 lines.
> So I tried doing 'git stash' again, and it gave me an error,
> fatal: git-write-tree: error building trees
> Cannot save the current index state
Hm... that's a new one.
> I don't have all the output. I had run git in a shell buffer a few
> times, and it causes a lot of trouble about the terminal. So I started
> running it in an ordinary terminal.
> Fortunately it seems that all my changes did make it into Savannah.
> So it is just a matter of how to get a clean repository.
> Is there any way I can fix this other than creating a new repository?
> I should not do that here; it would cost my host too much money, I
> fear.
If you are sure that all of your changes are on savannah, then
git reset --hard HEAD
should fix things.
Note that if you actually have local changes this is a command that will
lose those changes.
next prev parent reply other threads:[~2015-04-05 18:31 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 17:42 Stash Richard Stallman
2015-04-05 18:31 ` Steinar Bang [this message]
2015-04-05 18:38 ` Stash Eli Zaretskii
2015-04-06 5:50 ` Stash Richard Stallman
2015-04-06 6:37 ` Stash Steinar Bang
2015-04-06 7:35 ` Stash Eli Zaretskii
2015-04-06 7:57 ` Stash Eli Zaretskii
2015-04-07 19:31 ` Stash Stephen J. Turnbull
2015-04-08 5:28 ` Stash Eli Zaretskii
2015-04-06 5:50 ` Stash Richard Stallman
2015-04-06 6:50 ` Stash Steinar Bang
2015-04-06 6:55 ` Stash Eli Zaretskii
2015-04-06 11:25 ` Stash Mathias Megyei
2015-04-06 11:30 ` Stash Eli Zaretskii
2015-04-06 11:56 ` Stash Yuri Khan
2015-04-06 12:06 ` Stash João Távora
2015-04-06 12:25 ` Stash Eli Zaretskii
2015-04-06 12:19 ` Stash Eli Zaretskii
2015-04-06 11:59 ` Stash João Távora
2015-04-06 12:21 ` Stash Eli Zaretskii
2015-04-06 13:06 ` Stash João Távora
2015-04-06 6:55 ` Stash Eli Zaretskii
2015-04-06 14:53 ` Stash Steinar Bang
2015-04-06 15:07 ` Stash Harald Hanche-Olsen
2015-04-06 18:48 ` Stash Steinar Bang
2015-04-06 5:51 ` Stash Richard Stallman
2015-04-06 7:29 ` Stash Eli Zaretskii
2015-04-06 7:55 ` Stash Harald Hanche-Olsen
2015-04-07 16:13 ` Stash Richard Stallman
2015-04-07 16:48 ` Stash Eli Zaretskii
2015-04-07 19:51 ` Stash Stephen J. Turnbull
2015-04-08 18:20 ` Stash Richard Stallman
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-08 18:33 ` Stash Eli Zaretskii
2015-04-09 13:16 ` Stash Richard Stallman
2015-04-09 13:45 ` Stash Eli Zaretskii
2015-04-10 10:57 ` Stash Richard Stallman
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-07 16:58 ` Stash Andreas Schwab
2015-04-08 18:21 ` Stash Richard Stallman
2015-04-09 17:07 ` Stash Andreas Schwab
2015-04-10 10:58 ` Stash Richard Stallman
2015-04-07 20:12 ` Stash Stephen J. Turnbull
2015-04-09 13:16 ` Stash Richard Stallman
2015-04-09 16:53 ` Stash Stephen J. Turnbull
2015-04-10 10:58 ` Stash Richard Stallman
2015-04-10 11:18 ` Stash Eli Zaretskii
2015-04-10 13:52 ` Stash Stephen J. Turnbull
2015-04-05 18:40 ` Stash Paul Eggert
2015-04-05 19:25 ` Stash Harald Hanche-Olsen
2015-04-05 19:59 ` Stash Paul Eggert
2015-04-05 19:26 ` Stash Steinar Bang
2015-04-05 20:18 ` Stash Stephen J. Turnbull
2015-04-05 19:41 ` Stash Harald Hanche-Olsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86sice77h0.fsf@dod.no \
--to=sb@dod.no \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.