How should we sync our branches?

[jcklpe]

Hey @davidagnome

So I looked through the changes you made to the theme since I originally forked it and they were really too extensive for me to keep messing with so I decided to just refork the theme and copy over my changes to it manually.

I'm still in the process of doing that, but redoing stuff like this has also allowed me to think more intentionally where I differ in structure and organization from your branch.

I plan on using this theme for more than just DSA stuff, which is one reason why I am more aggressively componentizing things via SCSS. I'm also breaking out template parts differently.

Already (due to me using scss and having a different build structure) our themes have diverged again beyond the point of easy merging between our forks.

That's totally fine! But I wanted to check in with you if there might be some way for us to keep things synced anyway. I say this not only because I might want my version to be able to merge future changes you make, but also visa versa because I think you might possibly want to merge some changes I will be making in the future. I've got 3 weeks of vacation right now before I start my next job and I am planning on really dedicating the works to my branch to get it shipshape.

It's also perfectly fine if you don't like the way I'm doing things and want to maintain your own branch here. In that case I'll just break my branch off from yours and we'll treat these as essentially two separate themes.

Just to let you know also, I've recently been in contact with the National Tech Committee about Auth0 access which our chapter is in the process of trying to integrate. The plan is going to be that National Auth0 will be extended out for use to local chapters.

Part of that process has been me getting more involved with the National Techcomm's gitlab. I plan on posting a version of my theme to that gitlab org once I can, which seems to me to be all the more reason for us to cooperate.

Again, my experience working with other devs is limited so if I'm not approaching this right let me know.

[jcklpe]

@davidagnome Hey just wanted to let you know. I've done a ton of work on the theme. I still have a ton more to do but I think you might want to see what I've done and get your opinion on it. I've slashed and burned through a ton of cruft and I'm almost to the point where I'm going to start converting out everything to Gutenberg blocks.

You can see the repo here: https://github.com/jcklpe/common-wp