Check out this post for details on the flow chart https://steemit.com/bitcoin/@hotsauceislethal/bitcoin-rallies-on-segwit-news-entire-market-up

The SegWit activation will go into effect in about two weeks, after that they need to figure out what to do about 2MB hard fork (which undoubtedly will go into effect)