Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New updated icons6 #101

Merged
merged 3 commits into from
Aug 18, 2024
Merged

New updated icons6 #101

merged 3 commits into from
Aug 18, 2024

Conversation

ucapato
Copy link
Contributor

@ucapato ucapato commented Aug 18, 2024

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

Copy link

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

Name Link
Commit 276c3f6
Logs https://github.com/maforget/ComicRackCE/actions/runs/10443657972
Download https://nightly.link/maforget/ComicRackCE/suites/27307085437/artifacts/1825160313

@maforget maforget merged commit 7fce009 into maforget:master Aug 18, 2024
1 check passed
@maforget
Copy link
Owner

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

@ucapato
Copy link
Contributor Author

ucapato commented Aug 18, 2024

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
Copy link
Owner

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
Copy link
Contributor Author

ucapato commented Aug 21, 2024

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
Copy link
Owner

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.

@ucapato ucapato deleted the NewUpdatedIcons6 branch August 28, 2024 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants