search

Holzhaus / rekordcrate

Library for parsing Pioneer Rekordbox device exports
https://holzhaus.github.io/rekordcrate/
Mozilla Public License 2.0
77 stars 12 forks source link

Merge main into pdb pt2 #80

Closed Swiftb0y closed 1 year ago

Swiftb0y commented 1 year ago

CI is obviously still broken but at least this branch is now up to date and warning-free again so somebody can work on fixing it.

Holzhaus commented 1 year ago

Thanks, but the branch contains unfinished WIP commits that I don't want to end up in the git history of the main branch, so I think merging main is not the best option here. I rebased the branch on latest main instead.

Swiftb0y commented 1 year ago

Can you elaborate? this PR did exactly that. Merging main into pdb-serialization-pt2, not the other way around. I issued this in PR form since I had to resolve some merge conflicts and I obviously also don't have the access to push to your branch.

Holzhaus commented 1 year ago

It's basically impossible to amend the "WIP" commit (6a7e25d) once this PR would have been merged (due to the merge commit 3e89dd6 that comes after), which means there would be a broken WIP commit in main's git history if we ever merge the pdb-serialization-pt2 branch into main at some point.

Swiftb0y commented 1 year ago

Ok that makes sense. Thanks for taking care of rebasing then. Just out of curiosity: Why wouldn't fixups of the WIP commits not work?

Holzhaus commented 1 year ago

Rebasing with merge commits is messy because they have two parents. It might be possible but any time I tired it I found it cumbersome and just rebasing turned out the better option ;-)

Swiftb0y commented 1 year ago

Great. thanks for the wisdom. :+1:

Holzhaus commented 1 year ago

Great. thanks for the wisdom. +1

s/wisdom/incompetence when dealing with merge commits/ :wink: