25 Jun
2013
25 Jun
'13
7 p.m.
On Tue, 2013-06-25 at 19:52 +0200, Krzysztof Kosiński wrote:
In fact merging from trunk from time to time is encouraged, because it allows you to keep up to date and reduces the risk of surprise bugs appearing only after the final merge.
For separate branches, that's right. But if he's working from trunk then a push doesn't run a 'merge' on the remote branch, it replaces the revision history. At least, that's what happens from experience.
Martin,