commit discipline

> Hi,
>
> It looks like the commit activity is going up. Great!
>
> The side effect is that we now run into concurrent changes and thus,
> we need to deal with merges. As a discipline, please try to follow the
> following routine:
> - before commit, look at the changes
> - commit (do not forget the descriptive comment :))
> - after the commit, browse the remote repository to see if there is no
> concurrent change
> - if a concurrent change appeared, merge
>
> Cheers,
> Doru
>
>
> --
> www.tudorgirba.com
> "Every thing has its own flow"
> _______________________________________________
> Moose-dev mailing list
> [hidden email]
> https://www.iam.unibe.ch/mailman/listinfo/moose-dev

> Sorry about that.
>
> Alexandre
>
>
> On 23 Nov 2011, at 13:02, Tudor Girba wrote:
>
>> Hi,
>>
>> It looks like the commit activity is going up. Great!
>>
>> The side effect is that we now run into concurrent changes and thus,
>> we need to deal with merges. As a discipline, please try to follow the
>> following routine:
>> - before commit, look at the changes
>> - commit (do not forget the descriptive comment :))
>> - after the commit, browse the remote repository to see if there is no
>> concurrent change
>> - if a concurrent change appeared, merge
>>
>> Cheers,
>> Doru
>>
>>
>> --
>> www.tudorgirba.com
>> "Every thing has its own flow"
>> _______________________________________________
>> Moose-dev mailing list
>> [hidden email]
>> https://www.iam.unibe.ch/mailman/listinfo/moose-dev
>
> --
> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> Alexandre Bergel  http://www.bergel.eu
> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
>
>
>
>
>
> _______________________________________________
> Moose-dev mailing list
> [hidden email]
> https://www.iam.unibe.ch/mailman/listinfo/moose-dev
>

> Tudor and others.
>
> We did what should not have been done. We committed without merging in Famix-core. So there were two versions both having 176. Now, we did a merge of both and 177 of Famix-core should reflect both changes.
>
> Let us know if there is any problem. Sorry to bother.
>
> Nicolas and Usman
>
> On Wed, Nov 23, 2011 at 7:54 PM, Tudor Girba <[hidden email]> wrote:
> No no. There is nothing to be sorry about.
>
> It's just that given the amount of activity, we also need to raise
> organizational issues. Perhaps others have other issues that need to
> be discussed.
>
> Cheers,
> Tudor
>
>
> On Wed, Nov 23, 2011 at 5:11 PM, Alexandre Bergel
> <[hidden email]> wrote:
> > Sorry about that.
> >
> > Alexandre
> >
> >
> > On 23 Nov 2011, at 13:02, Tudor Girba wrote:
> >
> >> Hi,
> >>
> >> It looks like the commit activity is going up. Great!
> >>
> >> The side effect is that we now run into concurrent changes and thus,
> >> we need to deal with merges. As a discipline, please try to follow the
> >> following routine:
> >> - before commit, look at the changes
> >> - commit (do not forget the descriptive comment :))
> >> - after the commit, browse the remote repository to see if there is no
> >> concurrent change
> >> - if a concurrent change appeared, merge
> >>
> >> Cheers,
> >> Doru
> >>
> >>
> >> --
> >> www.tudorgirba.com
> >> "Every thing has its own flow"
> >> _______________________________________________
> >> Moose-dev mailing list
> >> [hidden email]
> >> https://www.iam.unibe.ch/mailman/listinfo/moose-dev
> >
> > --
> > _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> > Alexandre Bergel  http://www.bergel.eu
> > ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
> >
> >
> >
> >
> >
> > _______________________________________________
> > Moose-dev mailing list
> > [hidden email]
> > https://www.iam.unibe.ch/mailman/listinfo/moose-dev
> >
>
>
>
> --
> www.tudorgirba.com
> "Every thing has its own flow"
>
> _______________________________________________
> Moose-dev mailing list
> [hidden email]
> https://www.iam.unibe.ch/mailman/listinfo/moose-dev
>
> _______________________________________________
> Moose-dev mailing list
> [hidden email]
> https://www.iam.unibe.ch/mailman/listinfo/moose-dev