freetype: ziggify C structs and more #305

Merged

alichraghi merged 4 commits from freetype into main

2022-05-28 03:50:56 +00:00

alichraghi commented

2022-05-25 21:31:07 +00:00

(Migrated from github.com)

closes #296

By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right.

closes #296 - [X] By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right.

alichraghi commented

2022-05-25 21:37:27 +00:00

(Migrated from github.com)

hmm the CI is kinda, you have to make more...

emidoots commented

2022-05-26 06:09:46 +00:00

(Migrated from github.com)

@alichraghi sorry, conflicts after merging the other PR, can you fix?

alichraghi commented

2022-05-26 07:24:07 +00:00

(Migrated from github.com)

sorry im not git expert, is this the right way to fix conflicts (idk how to rebase into older commits)?

emidoots commented

2022-05-28 03:49:10 +00:00

(Migrated from github.com)

sorry im not git expert, is this the right way to fix conflicts (idk how to rebase into older commits)?

All good! That's generally good enough, but if there are merge commits I'll have to squash the entire PR into a single commit for merging (which is fine) as I want to keep merge commits out of main

I went ahead and ran git rebase origin/main for ya, that usually 'just works' and reapplies your commits on top of the latest main branch. Sometimes, you'll run into conflicts when you run that and you have to correct them in your editor and then run git rebase --continue to apply the next commit until you get through them all.

Anyway, good either way. Hope that's insightful!

> sorry im not git expert, is this the right way to fix conflicts (idk how to rebase into older commits)? All good! That's generally good enough, but if there are merge commits I'll have to squash the entire PR into a single commit for merging (which is fine) as I want to keep merge commits out of `main` I went ahead and ran `git rebase origin/main` for ya, that usually 'just works' and reapplies your commits on top of the latest `main` branch. Sometimes, you'll run into conflicts when you run that and you have to correct them in your editor and then run `git rebase --continue` to apply the next commit until you get through them all. Anyway, good either way. Hope that's insightful!

👍 1

emidoots (Migrated from github.com) approved these changes

2022-05-28 03:50:12 +00:00