LMMS • Forums

https://github.com/LMMS/lmms/pull/240
https://github.com/zonkmachine/lmms

Woopie!
So, in the last pull request I got stressed out and tried to fix things even though it was just fine at the third commit, fe863bb.
Yes, there might have been git push -f origin involved...
How do I get back on track?
The tutorial happily ends with the pull being accepted and then git fetch upstream / git rebase upstream/stable.
Now I have whacky commits both locally and on origin and github and I can't do pull requests which would include heaps of nonsense. Can I back both my local git and on origin (zonkmachine/lmms) and then fetch/rebase from upstream and push to origin?

...And yes, I ask here in the forum. Mailing lists sucks. We should have a separate subforum for coding stuff.

owallgren wrote:...And yes, I ask here in the forum. Mailing lists sucks. We should have a separate subforum for coding stuff.

Well I'm pretty much almost the only one involved with LMMS development who visits these forums, so you'd have much better luck getting answers to coding stuff on the mailing list. I don't know why you think it "sucks", but if you want to be involved in LMMS development, following the mailing list makes it much easier...

Anyway, on to the point. Perhaps you can create diff patches for the files you want to preserve, then do a git checkout <commit number> back to a safe point, then re-apply the patches on the files that you want changed? Then force-push your changes again, and this should overwrite the bad commits (ones after the safe point) away from the history.

I don't know if it's the prettiest way of doing it, but should work, if I understand your problem correctly.

diiz wrote:I don't know why you think it "sucks", but if you want to be involved in LMMS development, following the mailing list makes it much easier...

I don't feel in control and I don't get the instructions of it. But you're right off course, I'll look into it again. Maybe a proper mail reader instead of gmail online will do a difference?

I don't know if it's the prettiest way of doing it, but should work, if I understand your problem correctly

No. I'd rather go with something ugly and simple than anythig else if it fixes the problem.

Solved as follows
I started out with:
http://stackoverflow.com/questions/6872 ... h-to-a-tag
But as my earlier patches were lingering on I ended doing:
http://stackoverflow.com/questions/8134 ... o-upstream

Thanks for your patiens!

owallgren wrote:I don't feel in control and I don't get the instructions of it. But you're right off course, I'll look into it again. Maybe a proper mail reader instead of gmail online will do a difference?

If you feel more home at forums, you could try using a mailing list archive with a web interface that lets you post on the mailing list. Nabble.com is one such, which composes the mailing list in the form of a forum:

http://linux-multimedia-studio-lmms.996 ... el-f3.html

You still have to subscribe to the mailing list by email, but then you can read and post on the list via the web interface. There are even some other people on the list who do the same.

owallgren wrote:Solved as follows

Nice.