Am 30.11.22 um 11:24 schrieb andy pugh:
pins.c, hostmot2.h, hostmot2.c, release_notes.txt, hostmot2.9, hm2_eth.9
changelog and VERSION should all be resolved by --ours.
For release_notes.txt please accept both changes but in reverse order,
so that it look like this
On Fri, 2 Dec 2022 at 04:38, Sebastian Kuzminsky wrote:
> I'm merging 2.8 into 2.9, and I came across a spot where it looks like a
> feature was added independently to both 2.8 and 2.9 (7i96s support in
> pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8.
I was going to do that
I'm merging 2.8 into 2.9, and I came across a spot where it looks like a
feature was added independently to both 2.8 and 2.9 (7i96s support in
pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8.
Please remember folks: apply patches to the oldest branch where it
belongs, then
