[ADM] Please try to avoid merges in the git tree

[Harald Welte]

Hi all,

this is just a general request to everyone with git commit access on
the OpenBSC / Osmocom repositories.

I would appreciate to restrict the use of 'git merge' to the absolute
minimum neccessarry, as it makes the commitlog and timeline much harder
to understand.

If you're working on some private branch on a particular feature, please
rebase that private branch on current master before pushing the changes.

Thanks!

-- 
- Harald Welte <laforge at gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)