[mailcommon] /: Merge remote-tracking branch 'origin/Applications/17.04'

[Albert Astals Cid]

El dissabte, 22 de juliol de 2017, a les 17:11:54 CEST, laurent Montel va 
escriure:
> Le samedi 22 juillet 2017, 16:08:17 CEST Luigi Toscano a écrit :
> > Il 22 luglio 2017 15:54:33 CEST, laurent Montel <montel at kde.org> ha 
scritto:
> > >Hi,
> > >Why did you merge 17.04 to master  ?
> > 
> > (moving to release-team@)
> > 
> > I went through all repositories when creating Applications/17.08.
> > 
> > >Was it necessary to merge nothing  ?
> > 
> > I can't check all pim repositories right now, but I can if you want.
> > 
> > >Next time please do not it.
> > 
> > Then I prefer to discuss about "why" don't do it instead of a plain
> > prohibition.
> 
> Because there is not necessary to create a null commit.
> 
> When we create a patch in branch we make a git merge.
> 
> So I don't understand why you did it...

Because sadly not everyone is as good as you and some people forget to merge 
to master when fixing a bug in Applications/*.

So we did a merge to catch those.

Cheers,
  Albert

> 
> > The merge did not block anyone else work, the content is not broken and it
> > is the preferred worflow for most repositories. Again, do you have
> > specific
> > reasons about the "no"?
> > 
> > >Regards.
> > >
> > >Le samedi 15 juillet 2017, 20:49:51 CEST Luigi Toscano a écrit :
> > >> Git commit 5180e99af7cec6b31b99b7bb2fc5cb6e650cbeef by Luigi Toscano.
> > >> Committed on 15/07/2017 at 18:49.
> > >> Pushed by ltoscano into branch 'master'.
> > >> 
> > >> Merge remote-tracking branch 'origin/Applications/17.04'
> > >
> > >https://commits.kde.org/mailcommon/5180e99af7cec6b31b99b7bb2fc5cb6e650cbe
> > >ef