From: Karl Fogel <kfogel@red-bean.com>
To: emacs-devel@gnu.org
Subject: Re: This Is The Git Help Mailing List
Date: Thu, 13 Nov 2014 10:20:43 -0600 [thread overview]
Message-ID: <87d28r5axw.fsf@ktab.red-bean.com> (raw)
In-Reply-To: <m3sihnf5jy.fsf@stories.gnus.org> (Lars Magne Ingebrigtsen's message of "Thu, 13 Nov 2014 17:06:57 +0100")
Lars Magne Ingebrigtsen <larsi@gnus.org> writes:
>So, I had some locally checked-in changes that I wanted to push. So I
>said "git push".
>
>[larsi@stories ~/src/emacs]$ git push
>Warning: No xauth data; using fake authentication data for X11 forwarding.
>X11 forwarding request failed on channel 0
>To larsi@git.sv.gnu.org:/srv/git/emacs.git
> ! [rejected] master -> master (non-fast-forward)
>error: failed to push some refs to 'larsi@git.sv.gnu.org:/srv/git/emacs.git'
>hint: Updates were rejected because the tip of your current branch is behind
>hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
>hint: before pushing again.
>hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
>Ok, so I tried what I always do in the Gnus repo when this happens,
>which usually fixes everything.
>
>[larsi@stories ~/src/emacs]$ git pull --rebase
>Cannot pull with rebase: You have unstaged changes.
>Please commit or stash them.
>
>Err...
>
>Ok, how about just "git pull" like it says?
>
>[larsi@stories ~/src/emacs]$ git pull
>Warning: No xauth data; using fake authentication data for X11 forwarding.
>X11 forwarding request failed on channel 0
>remote: Counting objects: 29, done.
>remote: Compressing objects: 100% (13/13), done.
>remote: Total 13 (delta 10), reused 0 (delta 0)
>Unpacking objects: 100% (13/13), done.
>>From git.sv.gnu.org:/srv/git/emacs
> 38fa4bc..d856e6b master -> origin/master
> e18c2a5..3d08bc4 emacs-24 -> origin/emacs-24
>error: Your local changes to the following files would be overwritten by merge:
> lisp/ChangeLog
>Please, commit your changes or stash them before you can merge.
>Aborting
>
>Errr...
>
>What is the magic sequence of magic git commands that I should use now?
What does 'git status' say? You're positive you have no
uncommitted/unstaged local changes? It looks from the above like
lisp/ChangeLog has local mods... (cue our usual ISO-standard discussion
of about why we version change data in files instead of solely in commit
logs, of course, but that is another matter).
Best,
-K
next prev parent reply other threads:[~2014-11-13 16:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 16:06 This Is The Git Help Mailing List Lars Magne Ingebrigtsen
2014-11-13 16:19 ` Lars Magne Ingebrigtsen
2014-11-13 17:04 ` Eli Zaretskii
2014-11-13 17:19 ` Andreas Schwab
2014-11-13 17:38 ` Eli Zaretskii
2014-12-05 0:45 ` Juri Linkov
2014-12-05 2:04 ` Stefan Monnier
2014-12-05 4:26 ` Ted Zlatanov
2014-12-05 16:03 ` Rüdiger Sonderfeld
2014-12-05 15:59 ` Rüdiger Sonderfeld
2014-11-13 16:20 ` Karl Fogel [this message]
2014-11-13 17:24 ` Paul Eggert
2014-11-13 17:30 ` Lars Magne Ingebrigtsen
2014-11-13 16:21 ` Andreas Schwab
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=87d28r5axw.fsf@ktab.red-bean.com \
--to=kfogel@red-bean.com \
--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.