wp-content/themes/theme so when I merge it with the site branch, it should merge structures properly. However... Whenever I try to merge my theme branch into the site branch, it gives me an error like: unrelated commit history... any idea why that would occur?
8:08 PM
So I have two git branches. One which is my WordPress installation. Another which is exclusively my theme. I have my theme branch structured like:
2 hours later…
9:50 PM
think of it as a timeline, each branch is a new timeline, and by trying to merge 2 branches you're reintegrating them
what you have, is the reintegration of the Mayan Civilisation if things had gone as they did in this timeline, and you're merging in the "the eggs, then whisk. When the consistency is right, pour into the pan and" timeline
if they had common history, perhaps your solution would work, but then that theme branches history would involve deleting everything that isn't the theme, so it wouldn't work anyway
there's a little more to it ofcourse, in that a git commits hash is a product of all the hashes that came before it in that timeline, so there's a cryptographic element ( for data integrity though, not as a security measure )
for that reason, if you inserted something into the chain of changesets in the past, or modified a previous commit, all the future commits hashes would change
one other thing you could do, is add a git submodule for your theme folder, that references the same git repo but on the different branch
« first day (2925 days earlier) ← previous day next day → last day (2019 days later) »
