yade-dev team mailing list archive

[Jerome Duriez <Jerome.Duriez@xxxxxxxxxxx>]

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 [yade-dev-bounces+jerome.duriez=ucalgary.ca@xxxxxxxxxxxxxxxxxxx] on behalf of noreply@xxxxxxxxxxxxx [noreply@xxxxxxxxxxxxx]
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 <chaoyuan2012@xxxxxxxxx>
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