• 10:18 AM

Use git reflog to restore reset commit

The last day of the work day of last week, my colleague told me that he lost his previous two days of work because he reset his local git commit to a prior one without push his work to the remote first. Upon receive this alarming news, while I have many other things to finalize, honestly my heart was virtually fall out. Fortunately, I believe in the power of git that it must be able to restore this thing! And sure enough, it turn out very easy to do: (more…)

  • 09:14 PM

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


last comments

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?

  • 10:53 PM

Nicknames for types of your TMs

Do you know all what each of the following nickname mean? 🙂

  • The Attacker
  • The Complainer
  • The Comic
  • The Descerter
  • The Limelight Seeker
  • The Moonlighter
  • The Not-My-Jobber
  • The Bleeding Heart

  • 11:10 PM

Building team spirit

In order to build a team spirit, the following five factors are essential:

  1. Open communication
  2. Empowerment
  3. Clear roles and responsibilities
  4. An effective leader
  5. A reward and accountability system for both individual team members and the entire team.