From: Jonas Maebe <jonas.maebe@elis.ugent.be>
To: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Mark Kettenis <mark.kettenis@xs4all.nl>,
Eli Zaretskii <eliz@gnu.org>, Phil Muldoon <pmuldoon@redhat.com>,
gdb@sourceware.org
Subject: Re: GIT and CVS
Date: Fri, 14 Oct 2011 13:07:00 -0000 [thread overview]
Message-ID: <47656496-A338-44E2-8B98-82783D85FBD1@elis.ugent.be> (raw)
In-Reply-To: <20111014125356.GA15329@host1.jankratochvil.net>
On 14 Oct 2011, at 14:53, Jan Kratochvil wrote:
> On Fri, 14 Oct 2011 12:22:53 +0200, Mark Kettenis wrote:
>> (I've tried git stash, but it didn't seem to support my
>> development style, at least "unstashing" didn't "just work" when I
>> did
>> a git fetch in between).
>
> I do so sometimes myself, it works.
I believe some older git versions refused to "git stash pop" if there
was any conflict between the stashed changes and the new source code
(I remember struggling with that myself the first time I tried git).
Current git versions will however apply the stash in case of conflicts
and mark those conflicts. The only thing it does now in case of
conflicts is not drop the original stash (i.e., "git stash pop"
behaves like a "git stash apply") so that you can easily apply it
again on a clean copy should you somehow mess up during conflict
resolution.
Jonas
next prev parent reply other threads:[~2011-10-14 13:07 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 19:37 Phil Muldoon
2011-10-13 20:21 ` Joseph S. Myers
2011-10-13 20:55 ` Phil Muldoon
2011-10-13 21:33 ` DJ Delorie
2011-10-13 21:44 ` Phil Muldoon
2011-10-13 21:43 ` Alfred M. Szmidt
2011-10-13 21:51 ` Jan Kratochvil
2011-10-13 22:08 ` Eli Zaretskii
2011-10-13 22:25 ` Jan Kratochvil
2011-10-13 22:41 ` Alfred M. Szmidt
2011-10-13 22:44 ` Alfred M. Szmidt
2011-10-14 10:31 ` Eli Zaretskii
2011-10-13 22:19 ` Alfred M. Szmidt
2011-10-13 22:45 ` Jan Kratochvil
2011-10-13 23:37 ` Alfred M. Szmidt
2011-10-14 5:56 ` Jan Kratochvil
2011-10-14 6:51 ` Alfred M. Szmidt
2011-10-13 23:03 ` Phil Muldoon
2011-10-13 23:51 ` Alfred M. Szmidt
2011-10-14 6:01 ` Jan Kratochvil
2011-10-14 6:52 ` Alfred M. Szmidt
2011-10-14 7:01 ` Jan Kratochvil
2011-10-14 7:13 ` Alfred M. Szmidt
2011-10-14 15:39 ` Joseph S. Myers
2011-10-14 15:49 ` Jan Kratochvil
2011-10-13 21:51 ` Joseph S. Myers
2011-10-13 21:59 ` Jan Kratochvil
2011-10-13 22:08 ` Joseph S. Myers
2011-10-13 22:17 ` Eli Zaretskii
2011-10-14 5:03 ` Joel Brobecker
2011-10-14 8:04 ` Eli Zaretskii
2011-10-13 23:14 ` Phil Muldoon
2011-10-13 23:56 ` Joseph S. Myers
2011-10-14 6:04 ` Jan Kratochvil
2011-10-13 21:58 ` Eli Zaretskii
2011-10-13 23:20 ` Phil Muldoon
2011-10-14 8:13 ` Eli Zaretskii
2011-10-14 10:23 ` Mark Kettenis
2011-10-14 10:55 ` Eli Zaretskii
2011-10-14 14:09 ` Li, Rongsheng
2011-10-14 12:54 ` Jan Kratochvil
2011-10-14 13:07 ` Jonas Maebe [this message]
2011-10-14 14:26 ` Eli Zaretskii
2011-10-14 14:32 ` Jan Kratochvil
2011-10-14 15:05 ` Phil Muldoon
2011-10-14 15:21 ` Eli Zaretskii
2011-10-14 14:52 ` Phil Muldoon
[not found] ` <83zkh3k419.fsf@gnu.org>
2011-10-14 15:47 ` Jonas Maebe
2011-10-14 16:12 ` Andreas Schwab
2011-10-14 16:20 ` Andreas Schwab
2011-10-14 16:25 ` Eli Zaretskii
2011-10-14 17:06 ` Matt Rice
2011-10-14 17:25 ` Eli Zaretskii
2011-11-11 21:00 ` Steinar Bang
2011-11-12 8:30 ` Eli Zaretskii
2011-11-12 15:30 ` Steinar Bang
2011-10-14 5:10 ` Joel Brobecker
2011-10-14 15:38 ` Joseph S. Myers
2011-10-14 12:36 ` André Pönitz
2011-10-14 14:19 ` Eli Zaretskii
2011-10-14 15:02 ` Phil Muldoon
2011-10-14 15:16 ` Eli Zaretskii
2011-10-14 16:59 ` André Pönitz
2011-10-14 14:58 ` Phil Muldoon
2011-10-14 15:02 ` Paul_Koning
2011-10-16 15:04 ` Ralf Corsepius
2011-10-14 16:10 ` André Pönitz
2011-11-11 22:50 ` Pedro Larroy
2011-11-12 8:28 ` Steinar Bang
2011-11-13 0:05 ` John Hein
2011-11-15 15:02 ` Tom Tromey
2011-11-16 16:59 ` Christopher Faylor
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=47656496-A338-44E2-8B98-82783D85FBD1@elis.ugent.be \
--to=jonas.maebe@elis.ugent.be \
--cc=eliz@gnu.org \
--cc=gdb@sourceware.org \
--cc=jan.kratochvil@redhat.com \
--cc=mark.kettenis@xs4all.nl \
--cc=pmuldoon@redhat.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox