[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [mylyn-reviews-dev] git best practices
|
I would also prefer a flat history (i.e. using 'rebase' in favor of 'merge'). However we also should have small "do one thing" commits and 'rebase' with a series of commits has major drawbacks. (commits can get inconsistent)
Don't know what we should do right now. As soon as we have a Gerrit we should go for the JGit/EGit rules (or similar).
> -----Original Message-----
> From: mylyn-reviews-dev-bounces@xxxxxxxxxxx [mailto:mylyn-reviews-dev-
> bounces@xxxxxxxxxxx] On Behalf Of Chris Aniszczyk
> Sent: Montag, 7. Februar 2011 03:43
> To: Mylyn Reviews Project
> Subject: Re: [mylyn-reviews-dev] git best practices
>
> On Sat, Feb 5, 2011 at 3:32 AM, Steffen Pingel
> <steffen.pingel@xxxxxxxxxxx> wrote:
> > Hi,
> >
> > the recent commit history looks a bit chaotic with a bunch of merge
> > commits. I find it easier to follow changes if the history is linear
> > and it would seem good practice to squash similar commits before
> > pushing.
>
> It's all a preference thing but I like a flat history also... rebase
> is your friend :)
>
> > Does anyone have best practices recommendations or guidelines that
> are
> > used by other projects hosting sources in Git?
>
> In EGit/JGit, we use this as a guide...
>
> http://wiki.eclipse.org/EGit/Contributor_Guide#Granularity_of_Changes
>
> --
> Cheers,
>
> Chris Aniszczyk
> http://aniszczyk.org
> +1 860 839 2465
> _______________________________________________
> mylyn-reviews-dev mailing list
> mylyn-reviews-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-reviews-dev
