* Be wary of ChangeLog with "git pull --rebase"
@ 2015-01-06 17:38 Bart Schaefer
0 siblings, 0 replies; only message in thread
From: Bart Schaefer @ 2015-01-06 17:38 UTC (permalink / raw)
To: zsh-workers
I just had to very carefully resolve a problem where my latest committed
ChangeLog entries were discarded and replaced by unrelated ChangeLog entries
from origin/master. This was not obvious from the merge-conflict diff that
was created by the pull and in fact I'd have missed it entirely if I had
not also made a different mistake ("git commit" instead of "git add" before
continuing the rebase).
--
Barton E. Schaefer
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-01-06 17:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-06 17:38 Be wary of ChangeLog with "git pull --rebase" Bart Schaefer
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).