From: Eli Zaretskii <eliz@gnu.org>
To: pmuldoon@redhat.com
Cc: jan.kratochvil@redhat.com, mark.kettenis@xs4all.nl, gdb@sourceware.org
Subject: Re: GIT and CVS
Date: Fri, 14 Oct 2011 15:21:00 -0000 [thread overview]
Message-ID: <83wrc7k39u.fsf@gnu.org> (raw)
In-Reply-To: <m3zkh3mx4u.fsf@redhat.com>
> From: Phil Muldoon <pmuldoon@redhat.com>
> Cc: Jan Kratochvil <jan.kratochvil@redhat.com>, mark.kettenis@xs4all.nl,
> gdb@sourceware.org
> Date: Fri, 14 Oct 2011 16:05:37 +0100
>
> > You mean, you can pull or merge when you have uncommitted changes?
>
> git pull
>
> or
>
> git fetch/git merge
>
> If a conflict arises you have to git stash, then do above, then git
> stash pop. Or you can just commit your changes locally. The choice is
> yours.
With bzr, I have a better choice: resolve the conflicts, and that's
it. Just like with CVS. So I think for Mark it would be much easier
to adapt. Not that I fool myself that I will be able to convince the
others to adopt bzr...
> This is not how things are right now with CVS, but those steps are not
> onerous.
They might well be for someone who is a newcomer to git. The user
documentation is not exactly favorable to newbies, so you are at the
mercy of tutorials out there on the net, whose quality and accuracy
are questionable, especially with newer git versions making them
outdated quickly enough to cost you quite an amount of trial and
error.
next prev parent reply other threads:[~2011-10-14 15:21 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
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 [this message]
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=83wrc7k39u.fsf@gnu.org \
--to=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