- the hard anc complicated one but which is what most dev would do : fork mame, regulary merge their master branch into yours and solve conflicts if any.
That's the way I'd like to do it, but the problem is that solving conflicts in git is the part I'm scared about, since it can very quickly take you to a point where the whole repo is corrupted and you have to start from scratch, defeating the whole purpose of a VCS. Solving conflicts by hand is much easier for me.
git is a great tool that isolates conflict when they happen, asks you to solve them (there are a number of tools out there that don't require you to master the git command line) and does not commit anything as long as you haven't solved conflicts. But yeah, sometimes, it's complicated. IMHO this is not the way you should go for so many reasons :
- it takes time to master git, but mastering git is grateful, really
- one would expect that people who know how to compile (groovy)mame know how to patch a source code ...
- keeping track of your very own commits can become complicated as they're drown in mame's git history. Takes a few commands to find them
I honnestly think that going this path is a waste fo time
- the easiest one : just makie a repo with your patch + license file + some readme. Luckily 2 of these files will never change So you'd just have to update/rename the patch according to your switchres version number + mame version. Like what Doozer made with his linux patches
This sounds really easy, though I can't see that many advantages as to my current, manual "whatsnew" method, except for the warm feeling of being on github. I'll think about it.
See doozer's repo fr linux 15khz kernel patches :
https://github.com/D0023R/linux_kernel_15khzHe didn't fork the kernel, no need to update the repo with constant changes upstream. He just provides the patches, considering he tested them by himself.
The advantage is that it's not on a gdrive, kinda easier if any crazy mind feels like contributing (though you may need to add some notes on how to do this) + if there were no changes on your side, anyone could submit the update to the new version of mame (via pull requests, or git permissions to some people you trust)
From a dev point of view, a gdrive is a pain as it makes most command line tools unusable to automate things. Time to consider populating https://github.com/GroovyArcade with a new repo ?
Can't automate things due to gdrive? I hadn't think of that.
I want to find time to upload the whole CRT Tools source to github too.
[/quote]
He, who seeks help, shall always find a friend
There are enough people here with git knowledge to lead you on the path to the light
Be it Doozer (sorry for not asking you first haha) or me as a starter.
Once you're ready, you know where to ring