On Wed Sep 6 20:27:50 2023 +0000, Helix Graziani wrote:
> how do i do that?
git rebase -i HEAD~# (# can be any number of commits that aren't merge commits)
git rebase <branch> (<branch> is any branch, use it like git merge)
in this case I would say the easiest way (that I know of) is to get a diff, reset and then commit the diff, and then force push.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/3724#note_44471
On Wed Sep 6 20:13:16 2023 +0000, Etaash Mathamsetty wrote:
> btw your pull request isn't squashed and then merged, you have to squash
> all the commits into one (since this is just a single stub).
> To avoid merge commits use git rebase rather than git merge
ah ok
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/3724#note_44466
--
v2: dmusic: Get rid of the IDirectMusicInstrumentImpl typedef.
dmusic: Rename IDirectMusicInstrumentImpl method prefix to instrument.
dmusic: Simplify and cleanup IDirectMusicInstrument constructor.
dmusic: Get rid of struct collection liWavePoolTablePosition member.
dmusic: Get rid of struct collection liCollectionPosition member.
dmusic: Get rid of the IDirectMusicCollectionImpl typedef.
dmusic: Rename IDirectMusicCollectionImpl method prefix to collection.
dmusic: Move constructor parameter checks to class factory.
https://gitlab.winehq.org/wine/wine/-/merge_requests/3740
--
v4: dmsynth: Return DMUS_E_SYNTHNOTCONFIGURED when sink fails to activate.
dmsynth: Return S_FALSE if IDirectMusicSynth_Activate is no-op.
dmsynth: Forward IDirectMusicSynth_GetLatencyClock to the sink.
dmsynth: Implement latency IReferenceClock interface on the sink.
include: Use IReferenceClock interface from strmif.idl in dmusicc.h.
dmsynth: Move constructor parameter checks to class factory.
https://gitlab.winehq.org/wine/wine/-/merge_requests/3738
I wanted to use ._xy element access to make it shorter, but that attempt was crushed by the reality - such indexing apparently compiles but does not produce correct element access loads. I'm going to update once this is fixed.
--
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/329