On Thu, Feb 15, 2018 at 06:03:56PM +0100, Danny Milosavljevic wrote: > Hi Ricardo, > > > Danny, could you please do this on master and core-updates? > > I've done it on master now. > > Maybe it's me being used to SVN, but can I git am the commit to core-updates? > > Wouldn't that cause a conflict on the next merge of master to core-updates > (because of the missing in-betweens) ?
Git handles this case in my experience. If you try it and it becomes complicated, you could instead merge master into core-updates in order to get the change on core-updates. If you're not comfortable doing it with Git just let me know and I'll do it.
signature.asc
Description: PGP signature
