search

cliss / callsheet-localizations

Localization Files for Callsheet
7 stars 29 forks source link

Free Germans saving percents in the App Store #24

Closed DonSqueak closed 4 months ago

DonSqueak commented 4 months ago

Free searches for free Germans ;)

DonSqueak commented 4 months ago

Added first draft of German iOS description @cliss @technocidal

DonSqueak commented 4 months ago

Guess how long before I decided to run a diff of iOS v. visionOS? -- hint: too f***ing long :D

DonSqueak commented 4 months ago

@cliss Casey, do you by any chance know why I have a gazillion commits already filling up my PRs the moment I open them, all of which were already merged into upstream?

After you merge a PR, I always update my fork, and start with a number of commits already in the branch. What is going on there... I wonder...

From what I understand, only the last merge and the last commit from the list of twelve below should be there...

image

technocidal commented 4 months ago

@DonSqueak Looking at the shape of the commit graph, it seems that @cliss started squashing merges so the information about some of the commits that were merged gets lost. That's probably also why on your fork it says that it is 12 commits ahead. Unfortunately updating your fork just transports over the actual squashed merge commit but not the information which commits have been squashed.

A way around this issue would be to always create a new fork which might be cumbersome. There is probably also a way of rebasing your main branch after a merge to take the exact shape of @cliss main branch.

DonSqueak commented 4 months ago

Ah, that makes sense. Well, as long as the zombie commits don’t actually hurt anyone, I may just drag them along. Or I’ll try a rebase. Thanks!

technocidal commented 4 months ago

It should be fine, however the automatic commit messages that Github creates for the squash always contains all commits mentioned in the PR. That means, that it will get longer and longer which means that at some point it will be meaningless. You can already see this when comparing the commit message of #20 and the commit message of #22.

AFAIK it should not result in weird merge conflicts down the line.

cliss commented 4 months ago

@technocidal That's weird that squashing is hosing everything up, but your description makes sense. It's been a minute since I've done Git flow at my last jobby job.

I'm all ears if there's a better/more modern approach (aka Best Practice™) that I should be following!

cliss commented 4 months ago

@DonSqueak (cc @technocidal) I'm good to merge if y'all are…?