Skip to content

GStreamer 1.0: Fix git merge history

Timothy Davies requested to merge tdavies__fix_git_merge_history into gstreamer_python_upgrade

I've merged from bc0bee62 (!54 (merged)) to fix the git history, with all changes discarded (seeing as it was already merged in !78 (merged)). I think because I was squashing commits through the merge, git can't work out that gstreamer_python_ugprade and spiir-O4-EW-development are in sync. So every time I merge a new change from it, I get Every diff.

Merge request reports