Am 22.09.22 um 23:54 schrieb andy pugh:
I just tried to (locally) merge 2.8 into Master. I decided to use the
"ours" strategy so that nothing actually changed, all I wanted to do was
mark them as merged, without changing anything,
Looking at the dry-run patch, though, quite a lot seemed to change, though
comparing the patches to the current master on github, most of the changes
seemed to already be included.
If I do that and use "ours" on all conflicts, I get only three changed
files. One only with whitespace changes.
So I am puzzled. Especially as Hans merged on the 16th September.
Is there anything in 2.8 that _should_ be merged up to Master?
For me only the changes from
https://github.com/LinuxCNC/linuxcnc/pull/2057 should be merged up to
master, but they don't cause conflicts.
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
