[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [mylyn-reviews-dev] git best practices
|
+1, Agree, we normally work in distinct areas which should allow us to
do rebase for the most part
On Tue, Feb 15, 2011 at 12:43 AM, Matthias Sohn
<matthias.sohn@xxxxxxxxxxxxxx> wrote:
> 2011/2/15 Steffen Pingel <steffen.pingel@xxxxxxxxxxx>
>>
>> Sounds like there are benefits and risks to rebasing before pushing and
>> there may not be a one-fits-all policy that works for all cases.
>>
>> Looking at the specific history of the Reviews project repository it seems
>> that most merge commits could have been eliminated as there weren't any
>> conflicts to resolve. Since we have four different components that are
>> fairly independent I would expect this will be a common case unless several
>> people work in the same area of a component concurrently.
>>
>> As a compromise, can we agree on a strong recommendation to run a "git
>> pull --rebase" before pushing to keep the history as linear as possible? In
>> the end it should be up to each committer to make the call whether it's
>> worth the risk and trouble to rebase but generally I would like to encourage
>> it.
>
> +1, that sounds reasonable to me
>
> --
> Matthias
>
> _______________________________________________
> mylyn-reviews-dev mailing list
> mylyn-reviews-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/mylyn-reviews-dev
>
>
