I think "git merge feature-branch --no-ff" is great, but if the
feature-branch consists of only one commit, it seems a bit overkill. Would
you mind rebasing feature-branches onto the newest master and merging them
with --no-ff selectively?
If others disagree, please say so, so that we can agree on a common pattern.
Sent: Mittwoch, 12. Juni 2013 20:35
Subject: [libjitsi-commits] master: Merge branch 'deviceVolume' (c69cd21)
Repository : ssh://lists.jitsi.org/libjitsi
On branch : master Link :
Merge branch 'deviceVolume'
wrote on ../jitsi/impl/neomedia/HardwareVolumeControl.java | 9