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…)
- 10:18 AM
- 09:14 PM
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:
good thing that git has cheap branching.
What would be the meaning of the Main Branch?
you mean the Master Branch?