Hi Andy,
"s-ours" works and does what you think, the inspection is the issue, not
the merge, .
git log -p (and git show) on a merge commit display a combined diff
against all parents. For an "-s ours merge" that includes the diff
against the 2.9 side, which is the whole codebase delta between the
branches. That is why it looks like there are changes. It is not telling
you what the merge did to master.
What you actually want to confirm is that the merge left master's tree
untouched. Compare the merge commit to its first parent:
git diff <merge-sha>^1 <merge-sha>
If that is empty, master is unchanged and the merge just records 2.9 as
merged. The two trees will still differ (they are different codebases),
but they are "in sync" in the sense you want.
You can also use:
git log -p --first-parent <merge-sha>~1..<merge-sha>
which should show nothing.
Cheers,
Luca
On 6/13/26 5:59 AM, andy pugh wrote:
There has been a lot of good work done on Touchy recently, to make it
better behaved on smaller screens (I don't blame cradle for this, I
think that Gtk has changed)
I have cherry-picked a number of master commits to 2.9, and was
planning to push them to 2.9 but I have hit a bit of a snag with then
merging 2.9 into master (as we do).
Despite merging with "-s ours" a dry-run of the push (inspected with
git log -p SHA..SHA) shows changes and I don't want there to be any.
I want to tell git that, at this point, 2.9 and master are synched.
Any ideas?
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
