Am 24.09.22 um 16:22 schrieb andy pugh:
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?
Ah okay you look at the recent changes from 2.8.
But I don't really understand your concerns.
Having a look at diff between 2.8 and master of the the changes files
gives you a clue what is actually handled in master.
I did this:
changed_files=( $(git log da99e19495..f0ad48afa1 --name-only
--pretty=format: | grep -v '^$' | sort | uniq ) )
for i in "${changed_files[@]}"
do
git diff master 2.8 $i
done
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
