Re: Harmonious collaboration - reverting commit process

OMG, is this causing my git “rebase master” to fail? Been trying to fix
that all day yesterday…

Leon

Op wo 9 jun. 2021 om 18:20 schreef Howard Trickey via Bf-committers <
[email protected]>

> Speaking of that error -- submodules changed by mistake -- what is the best
> practice to avoid that? My GSoC mentee was asking about that, and I told
> him
> what I do, but it seems clunky and there is probably a better way.
>
> What I do:
> 1) make sure I've used "make update" or something similar to ensure that
> the
> submodules are up to date
> 2) when I "git add" files, I always add explicitly, one by one, only those
> files
> that "git status" shows I've changed. In other
>
> Is there something easier than (2)?
>
> On Wed, Jun 9, 2021 at 7:46 AM Jeroen Bakker via Bf-committers <
> [email protected]> wrote:
>
> > A common reason why I revert commits is that submodules were changed by
> > mistake. Is reverting a good solution? Perhaps worth mentioning.
> >
> > Jeroen
> >
> >
> > On Wed, Jun 9, 2021 at 12:55 PM Sergey Sharybin via Bf-committers <
> > [email protected]> wrote:
> >
> > > Hi,
> > >
> > > Today I continued to update the development process guidelines and
> > policies
> > > on the Wiki. This is based on previous discussions with the other
> > > bf-admins, and I'm working with Dalai on the final text adjustments. So
> > > today we handled the "polemic" topic of reverting commits:
> > > https://wiki.blender.org/wiki/Process/Revert_Commit
> > >
> > > Feedback and suggestions are welcome.
> > >
> > > Please note that we do read the feedback you are giving. Currently we
> are
> > > focusing on finishing the first pass of the process update. We will
> then
> > > look into addressing your feedback to make the development process fun
> > and
> > > smooth!
> > >
> > > Best regards,
> > > - Sergey -
> > > --------------------------------------------------------------------
> > > Sergey Sharybin - [email protected] - www.blender.org
> > > Principal Software Engineer, Blender
> > > Buikslotermeerplein 161, 1025 ET Amsterdam, the Netherlands
> > > _______________________________________________
> > > Bf-committers mailing list
> > > [email protected]
> > > https://lists.blender.org/mailman/listinfo/bf-committers
> > >
> > _______________________________________________
> > Bf-committers mailing list
> > [email protected]
> > https://lists.blender.org/mailman/listinfo/bf-committers
> >
> _______________________________________________
> Bf-committers mailing list
> [email protected]
> https://lists.blender.org/mailman/listinfo/bf-committers
>
_______________________________________________
Bf-committers mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-committers