On Fri, 23 Sept 2022 at 08:14, Hans Unzner <hansunz...@gmail.com> wrote:
> If I do that and use "ours" on all conflicts, I get only three changed > files. One only with whitespace changes. git merge -s ours 2.8 git push --dry-run git log -p da99e19495..f0ad48afa1 > merge.txt Gives: https://paste.debian.net/1254868/ Which seems to include a lot of changes that I _think_ are already handled in master? -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
