tgstation/-tg-station — pull request #6649 by paprka (2014-12-29 08:22:22+00:00)
Title: ---- [READ THIS SHIT] Semi-code freeze is in effect above this line ----

A large pull request is up to rewrite a lot of the master controller and other systems such as shuttles.

In order to expedite this process, avoid merging PRs that will conflict with the PR below. If you're the one who is making the PR, and it hasn't been made yet but it conflicts with Carn's PR, it's a better idea to hold off on creating it until the rewrite has been merged so you can present it without any conflicts.

https://github.com/tgstation/-tg-station/pull/6644

Map changes will almost certainly conflict due to the nature of map files, so all mapping changes are frozen until the above PR has been merged.

An easy way to tell if your PR/a proposed PR will conflict without the command line is to use github's compare function.

https://github.com/Carn/-tg-station/compare/MC_UPDATED

Simply hit 'edit' at the right, select your fork instead of 'tg-station', and then your branch just to the right of that.

![clip 2014-12-29 at 12 12 08](https://cloud.githubusercontent.com/assets/7247232/5567057/13e1f906-8ef0-11e4-9a30-c140008d58eb.png)

Then hit 'create pull request' to check if github can automatically merge the two PRs.

![clip 2014-12-29 at 12 16 49](https://cloud.githubusercontent.com/assets/7247232/5567058/152f48cc-8ef0-11e4-87d1-2f81f2dbb808.png)

![clip 2014-12-29 at 12 15 11](https://cloud.githubusercontent.com/assets/7247232/5567061/251a8f94-8ef0-11e4-964f-a562e31ef9a7.png)

If you get this, you're good to go! If not, please hold off on making the PR to the TG codebase until the rewrite has been merged.

I'm sure someone savvy with the command line can post how to compare your branch with carn's branch below. TKDRG mentioned how to, but I completely forgot! :alien: