[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: heads-up: Haskell updates
From: |
Leo Famulari |
Subject: |
Re: heads-up: Haskell updates |
Date: |
Thu, 15 Feb 2018 12:46:14 -0500 |
User-agent: |
Mutt/1.9.3 (2018-01-21) |
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
- Re: core-updates, last call?, (continued)
- Re: heads-up: Haskell updates, Chris Marusich, 2018/02/18
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates, Andreas Enge, 2018/02/15
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/15
- Re: heads-up: Haskell updates,
Leo Famulari <=
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/15
- Re: heads-up: Haskell updates, Danny Milosavljevic, 2018/02/16
- Re: heads-up: Haskell updates, Marius Bakke, 2018/02/16
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/16
- Re: heads-up: Haskell updates, Marius Bakke, 2018/02/16
- Re: heads-up: Haskell updates, Leo Famulari, 2018/02/16
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/16
- Re: heads-up: Haskell updates, Mark H Weaver, 2018/02/16
- Re: heads-up: Haskell updates, Ricardo Wurmus, 2018/02/16
- Re: heads-up: Haskell updates, Oleg Pykhalov, 2018/02/17