[OpenWalnut-Dev] How to avoid monster merges?

[Mathias Goldau]

Hi,

from time to time some merges appear which are of size of almost 1MB. I have
several problems with them:
 - the probability of making mistakes rises
 - if you know there was a mistake with such a merge, you may easily spend
much time to correctly undo the error
 - if a small feature was merged away you may not see it due the monstrosity

So, the only way around is to merge much more often.

math

-- 
Institut für Informatik
Universität Leipzig
Johannisgasse 26, 04103 Leipzig
Phone: +493419732283