I currently have a local repository that I’ve managed using the pull download of a .TAR.GZ file that I then edit on our server. Moving into this year, I’m re-configuring a number of legacy software pieces to work better through CLI (due to situations that would lead to working remotely). I’m running into a few questions that I don’t have a great place to find answers and I’m hoping someone can enlighten me.
Currently, I’m brushing up on my
git commands and doing more using both that as well as
composer with another project. Right now, I have my local repository cloned and pushed into my Github remote location. What I would like to do is the following:
- Pull the most recent stable version of OJS - I’m pretty sure this is OJS 22.214.171.124
- The command would be
git rebase --onto 3_3_0-8 3_3_0-7if I understand the READ.ME document correctly in order to merge the new file updates onto my current repository.
- Merge the changes and cleanup the conflicts (I have
KDIFF3and will use that)
Since I’ve never done this, I don’t even know how to get started. Do I create a new branch for the upgrade, clone the stable version of OJS from
pkp/ojs and then merge the two branches from there? If that’s the case, then I think I can manage that but if it’s not, since that’s my only thoughts, I’d like to hear what the best practices are. I don’t want to get into bad habits.