git clone git://op25.osmocom.org/op25.git

then

    git checkout max-pybombs

Also, there have been numerous trunking updates - see the signal scope page (scroll down approx. 2/3)

   http://op25.osmocom.org/trac/wiki.png/wiki/SignalScopePage

For the trunking updates there is a separate branch max-trunking-update1 which should be a superset of max-pybombs .

As for the existing installed version(s) of op25, if you go through the pybombs process it will install a copy of gr-op25 in a separate location that in theory should not conflict with other prior version(s).

Max