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

Removed commas from a Publisher name #85

Closed ucapato closed 4 months ago

ucapato commented 4 months ago

Rename Farrar Straus and Giroux icon by removing the commas, previously it was:

'Farrar, Straus and Giroux#Farrar Straus Giroux#Farrar, Straus, Giroux.png'

and now it is: 'Farrar Straus and Giroux#Farrar Straus Giroux.png'

maforget commented 4 months ago

Next time create a new branch for a new PR or Delete this one and recreate it. As it is now it shows changes that have already been merged.

ucapato commented 4 months ago

Hi,

Understood.

So, for every new commit (changes, updates, etc...) I should perform like this:

  1. Go to my Master Branch from my Repo (My fork the Main ComicRackCE)
  2. Delete the previous branch I had with my previous commits
  3. Create a new one (or re-create the same)
  4. Apply my new changes
  5. Commit them, push
  6. ... and then... do a PR.
maforget commented 4 months ago

When creating your new branch make sure that it is from the latest possible master. That is why last time I talked about the setting that either creates a branch from my or your master. If it is from yours you will need to update it (there is an option on the client and the site to update your master). If you kept it clean it will be straightforward, if not you might have conflicts that will need to be resolved.

It is to prevent these conflicts that creating your branch from the latest helps. It reduces the risk that the same file was modified in both places and have conflicts. Just make sure to pull of there were changes to master before creating it.

Also there is no need to create a branch from the website first. You can do it locally and just push it, it will be created on the website. You can have multiple local branches for testing or that you aren't ready to push.