Sometimes you want to have a subdirectory on the master branch be the root directory of a repository’s gh-pages branch. This is useful for things like sites developed with Yeoman, or if you have a Jekyll site contained in the master branch alongside the rest of your code.

For the sake of this example, let’s pretend the subfolder containing your site is named dist.

Remove the dist directory from the project’s .gitignore file (it’s ignored by default by Yeoman).

Picking the right architecture = Picking the right battles + Managing trade-offs

1. Clarify and agree on the scope of the system

• User cases (description of sequences of events that, taken together, lead to a system doing something useful)
  • Who is going to use it?
  • How are they going to use it?

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

文/端宏斌

昨天的文章毫无悬念被“和谐”了，这早就见怪不怪了，被删的时候，点击量已经接近100万，这说明了读者的认可。

我想送一张图给某些人：一束光照进房间，房间里的肮脏龌龊被显现，这束光就有罪了么？把窗户堵上并不解决问题啊。

今天我想来谈一个比较严肃的话题，咱们的老百姓为什么会不高兴？

文/端宏斌

上周的文章《对付美帝的正确姿势》果然是活不过24小时，不过在被删前点击量已经破了10万+。很多人在后台留言希望我单独把文章发给他，很抱歉，真的做不到，你想要看被删的文，唯一办法就是早点看。

我和其他公众号不一样，我更新的频率不高，一周也就1-2篇，最近微信大改版，公众号文章变成了信息流的形式，如果你不想错过我的文章，建议把“老端的观点”置顶或标星，这样就可以确保不错过。

——————————————

这段时间各种小道消息不断，上周四，外媒报道说周末降准，果然周末就降准了。还有人说上层考虑用人民币贬值的方式来对冲贸易战，果然人民币开始天天大幅下跌，今天开始传闻货币化棚改要喊停了，逼得上头跑出来辟谣，说并没有叫停，但是大幅放缓是肯定的。还有人说房产税草案已经出来了，但是报上去之后被打了回来。

原始的类必须都有注解 @RefreshScope

引用该类的地方有 @RefreshScope 才会刷新 @Value 注入的值