Attention is currently required from: fixeria, dexter.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31497 )
Change subject: pcu_sock: activate/deactivate PDCH on pcu reconnect ......................................................................
Patch Set 9:
(1 comment)
File src/osmo-bsc/timeslot_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/fe703c49_c84d4181 PS9, Line 347: }
it is very easy and quick to put the code move in a separate patch preceding this patch, so that the […]
ok so i added a move patch, pushed on branch neels/for_dexter; you can rebase your branch like this:
git fetch git checkout pmaier/e1gprs git rebase -i origin/neels/for_dexter
and when you hit the merge conflict just run this to resolve with no effort:
git checkout --theirs src/osmo-bsc/timeslot_fsm.c git add src/osmo-bsc/timeslot_fsm.c git rebase --continue