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
On Friday 17 of April 2009 19:46:13 Donnie Berkholz wrote:

> Fact is, most people using an SCM aren't deeply familiar with it. They > learn enough to work and stop there, unless they've got a lot of time on > their hands..
Actually --rebase is certainly going to cause some issues even for those familiar with git, especially while resolving conflicts - as while doing rebase, locally commited changes are now marked as "remote" - which certainly is going to be misleading in non-trivial conflicts. As you know it's as well pretty dangerous operation as it *rewrites* git history. On the other hand it makes new commits not disappear somewhere in the middle but added to the tip of rebased branch - that being said I guess it will be desired practice to always: git pull --rebase Anyway, in my opinion, either forbidding rebase or forcing rebase should be made commit policy. -- regards MM

Attachments

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

Replies