Hi Chao, I have the feeling this kind of "merge" commit has to be avoided, did you set auto-rebase ? (see midlle of https://yade-dem.org/doc/github.html#working-directly-on-git-trunk-recommended-for-frequent-commits)
________________________________________ From: Yade-dev [[email protected]] on behalf of [email protected] [[email protected]] Sent: October 15, 2014 3:39 PM To: Yade developers Subject: [Yade-dev] [Branch ~yade-pkg/yade/git-trunk] Rev 3482: Merge branch 'master' of github.com:yade/trunk Merge authors: Jérôme Duriez (jduriez) ------------------------------------------------------------ revno: 3482 [merge] committer: Chao Yuan <[email protected]> timestamp: Wed 2014-10-15 20:20:54 +0200 message: Merge branch 'master' of github.com:yade/trunk modified: pkg/dem/Shop_02.cpp -- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
