justinmeiners / classic-colors

Paint program for Unix. Inspired by MS Paint (Windows 95-98).
GNU General Public License v2.0
46 stars 3 forks source link

Even more catching up and some fixes. #39

Closed MagnetarRocket closed 1 year ago

MagnetarRocket commented 1 year ago

I have been out an while, adjusted menubar naming to be in line with common motif app standards(Setting *menuBar in xdefaults should work uniformly with motif apps in general) and added in a start to non-fixed HTML help locations(Attempting to not trust the old defaults as package managers my be silly in putting down spots), also had to put in an correction to the first commit.

rpendleton commented 1 year ago

It looks like you're cherry-picking merge commits into your repo in order to get up-to-date with Justin's repo. This leads to noisy commits and can make it hard to determine which commits actually introduced changes when viewing PRs. (It's also not very practical long-term, since it means you'd need to cherry-pick every single PR that's merged to this upstream repo to keep your fork up-to-date.)

Rather than cherry-picking merge commits into your branch to catch up, it would be better to simply rebase your branch on the upstream master branch.

MagnetarRocket commented 1 year ago

How to rebase? I'm still somewhat new.

rpendleton commented 1 year ago

This StackOverflow answer provides a decent explanation of how to do a rebase from a GitHub fork:

How do I update or sync a forked repository on GitHub?

justinmeiners commented 1 year ago

@MagnetarRocket Good to see you back! Ryan will be helping me out.

rpendleton commented 1 year ago

I cherry-picked the string part of the "menubar" -> "menuBar" change into master, which closes this PR.

As for the hard-coded help path, it looks like #32 has already been created for that.