• 10:18上午

使用git reflog恢复由于reset丢掉的commit

上个星期的最后一个工作日,我的一个同事突然跟我说他丢掉了所有的前两天的工作,因为他使用了git reset命理到了一个之前的commit,而他本地新的工作并没有push到远程。在收到这个“噩耗”般的消息后,已经被多个事情需要在周末之前确定的我,一时心脏都快要停止跳动了(joking… ^_^) 。但是,我相信git的威力它一定有办法把这个东西恢复过来。确实,结果这个工作其实非常的容易: (more…)

  • 09:14下午

Just another successful Git Branching Model for flexible sprint cycle

This Git Branching Strategy is based on the famous “Git Flow“ process (http://nvie.com/posts/a-successful-git-branching-model/ ). However, according to our project’s sepcific needs, we adapted the basic branching principle and made some modification on the original model. In the end, this branching model is shown by the picture below:

Git Branching Model illustration
Git Branching Model illustration

(more…)

last comments
joseph
joseph

good thing that git has cheap branching.
James Ting
James Ting

What would be the meaning of the Main Branch?
David Adam

you mean the Master Branch?

  • 09:25下午

Use Drupal as a direct project prototype and project management tool

Currently I manage a Drupal project based on Drupal commerce. While I am writing the specs for the project, I really feel that actually we can use Drupal as a platform serve as prototype and project document management tool. (more…)