I tried searching for a discussion about this on here and came up with nothing, if this has been covered please link me! I did find this thread: How to update to latest Sage without losing work but not exactly what I’m trying to do.
I currently keep a fork of Sage 8, with a set of changes, a style guide and some template files (I built a small ‘layout composer’ using ACF) and some other stuff I use in every project.
When building a client site, my process is as follows:
- Create a Bedrock project via composer
- Start a git repo at the top level of bedrock (so /.git/ is in the root, along with .env and /web/ etc.)
- Install Sage 8 in /web/app/themes/sage by cloning my Sage 8 fork
- Delete the /web/app/themes/sage/.git/ directory and commit sage into my main repo.
- Develop my theme.
Occasionally, between projects… I will resync some of the latest changes from Sage 8 into my fork, but I don’t have a set method for doing this. Sometimes I git merge stuff in and deal with the conflicts, sometimes I just check the commits and copy and paste in things.
I’m currently adopting Sage 9 (loving it so far!), and was just wondering if other people are working similar to this and how you deal with resyncing important changes from Sage 9’s main branch?
From my project specific git repo that starts at the root of Bedrock, I can do some kind of git merge that pulls the Sage 9 upstream into the /web/app/themes/sage directory, and lets me deal with the merge conflicts.
I feel like it may be my basic Git skills letting me down! Can anyone suggest anything or point in the right direction?