Asido is pure PHP5 now! asido.info 6 Dec 2007 | 01:32 am

As promised, Asido has ditched the PHP4 compatibility and is now purely PHP5. The old hybrid PHP4/PHP5 version is branched in SVN under /branches/asido-php4-php5 for all of you that still want to play...

Forgotten Subversion Commands, Undo, Merge Branches and More justaddwater.dk 29 Jun 2012 | 03:42 am

In a current project I use a lot of Subversion (svn) from the command-line. Subversion recently has lost terrain to Git for several reasons. But actually, svn is capable of doing many of the things I...

svn merge -c andy.wordpress.com 15 Jun 2012 | 04:47 am

How many times have you frantically googled “svn merge revert” to remember how to undo a recent commit? If you answered “too many” then you were probably confused by the syntax of svn merge -rARG1:ARG...

SVN培训大纲 blog.iworm.net 23 Aug 2012 | 06:27 am

这份大纲是我在公司做SVN培训时用到的，感觉可能对其他人有用，就贴了出来。 日常操作 地址： https://svnserver/svn/hrms/trunk https://svnserver/svn/hrms/branches/release https://svnserver/svn/hrms/branches/dev 迁出 提交：顺利提交、提交失败，提示先更新 提交日志：日志内容、与Iss...

Remove Merged Branches from Git freerobby.com 27 Jan 2013 | 02:28 am

I wrote a bash function that prunes a git repository’s ancestral branches, helping you keep your local and remote repos tidy. This function removes all branches, local and remote, that have been merg...

Git rebase + stash 小技巧 blog.wu-boy.com 18 Aug 2013 | 08:37 am

每天打開電腦，第一件事情就是將專案程式碼更新的最新，以便整合同事新開發的功能，免的跟自己寫的功能衝突，所以最常用用的就是 git pull –rebase origin master，此命令使用 rebase 來取代 merge 程式碼，也可以避免在 log 清單內出現 merge branch master into master 等字樣，但是如果在開發一半進度時，想同時將同事的程式碼先 mer...

Merge branch '3.7' phpunit.de 26 Aug 2013 | 06:32 pm

Merge branch '3.7' phpunit.de 26 Aug 2013 | 06:11 pm

Merge branch '3.7' phpunit.de 25 Aug 2013 | 05:32 pm

Merge branch 'master' of https://github.com/sstephenson/sprockets getsprockets.org 15 Aug 2013 | 02:49 am