Gentoo Archives: gentoo-scm

From: Maciej Mrozowski <reavertm@××××××.fm>
To: gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability
Date: Sat, 18 Apr 2009 00:47:28
Message-Id: 200904180247.22314.reavertm@poczta.fm
In Reply to: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability by Donnie Berkholz
1 On Friday 17 of April 2009 19:46:13 Donnie Berkholz wrote:
2
3 > Fact is, most people using an SCM aren't deeply familiar with it. They
4 > learn enough to work and stop there, unless they've got a lot of time on
5 > their hands..
6
7 Actually --rebase is certainly going to cause some issues even for those
8 familiar with git, especially while resolving conflicts - as while doing
9 rebase, locally commited changes are now marked as "remote" - which certainly
10 is going to be misleading in non-trivial conflicts.
11 As you know it's as well pretty dangerous operation as it *rewrites* git
12 history. On the other hand it makes new commits not disappear somewhere in the
13 middle but added to the tip of rebased branch - that being said I guess it
14 will be desired practice to always:
15 git pull --rebase
16
17 Anyway, in my opinion, either forbidding rebase or forcing rebase should be
18 made commit policy.
19
20 --
21 regards
22 MM

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies