![]() GitHub to the RescueĪfter hitting a, proverbial, brick wall, I thought I’d try and find further information via GitHub that could help aid in my search. I experimented with git log, branch, cherry, reflog, and name-rev, trying to find a way to build the relevant branch list, seeming to get ever closer, but never quite getting there. The trouble is, my knowledge of git isn’t at the advanced level. Whether that’s the right approach or not I’m not sure. I thought I’d be able to get a list of them, then merge them one by one. To do that, my first thought was to find out which feature branches merged to master had not yet been merged to “ stable10” that way, I could merge changes in logical batches. Given that, I then needed to find out which ones. However, that way of working has the potential for feature branches merged to master to not be merged to an applicable, “ stable”, branch.Īnd so it was recently with the latest version branch, “ stable10” a number of PRs had been merged to master, but were missing from “ stable10”. For example: “ stable8” contains the documentation for ownCloud version 8 and so on. For every ownCloud release there’s an equivalent branch.Each change is made on a feature branch forked from master and merged back to master, when discussed and approved.master is the source of all truth, containing all of the latest changes.To do that, we keep the documentation in a git repository on GitHub and work with it as follows: Here’s why.Īs part of my work as documentation lead at ownCloud I have to ensure that the documentation reflects - as much as possible - the various ownCloud releases. ![]() If you need to quickly create a PR of the changes between two branches, GitHub is the quickest and most pragmatic choice.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |