search

maforget / ComicRackCE

A Community Edition for the legendary Comic Book Manager ComicRack. ComicRack is back from the dead.
GNU General Public License v2.0
335 stars 33 forks source link

New updated icons6 #101

Closed ucapato closed 3 months ago

ucapato commented 3 months ago

Update on Globo and DC Comics logo in addition the Brand change throughout time

github-actions[bot] commented 3 months ago

Build Successful! You can find a link to the downloadable artifact below.

Name Link
Commit 276c3f6d2cbb30e6e45ca4d79fadabe6fa779b90
Logs https://github.com/maforget/ComicRackCE/actions/runs/10443657972
Download https://nightly.link/maforget/ComicRackCE/suites/27307085437/artifacts/1825160313
maforget commented 3 months ago

You really need to update your branches more before doing a merge. Like I stated in #62, the folder has changed location.

ucapato commented 3 months ago

You really need to update your branches more before doing a merge. Like I stated in #62, the folder has changed location.

Yes, I have seen your latest change with the Output Directory, but I have done something wrong at my Fork that never synch this latest updated. I double-check that in a next update.

maforget commented 2 months ago

Your online commits seems fine, what is probably happening is that locally you are reusing the same branch name NewUpdatedIcons6. You've deleted the Github branch in the last PR, but you probably kept the offline version and that was the one that was checked out. You added the files to it without realizing that the version you had was based on your old PR. Pushed it and it was based on the old PR.

Not a big deal, this is why git is useful, I wasn't sure myself how it would react to different folders. In fact is detected the folder moves even for new files 😀. It's bound to happen, I've got several branches that are pretty old.

One thing to keep in mind I've discovered. Once things have been pushed to Github you don't want to mess with the commit history by doing a rebase or a force push for example.

ucapato commented 2 months ago

Ok, I see...

My practice today after a PR and having it merged is to always delete the latest used branch (e.g.: NewUpdatedIcons6) and create a new one (e.g.: NewUpdatedIcons7) at my forked repo. As I have new updates I'll "populate" this branch until I feel it is time to make a new PR. Git is a bit confusing sometimes, but it has some beauty on it as well.

maforget commented 2 months ago

Deleting the old branch is fine, but remember that not only the one from GitHub but that same branch locally also.

And to make sure which is the one that is currently checked out when pushing changes.