To completely reset Tribler you can remove the settings directory in its entirety. In light of code ownership and the you break it for everyone, you fix it for everyone mentality of monorepos (see #5386 (comment)) I believe the fully automatic approach is the better one. Do not put the incline number on the front cover of this manual. So our options are then to (a) fire-and-forget and hope someone (who has no in-depth knowledge of what the code does - or forgot by the time he arrives at the scene) fixes it manually for us in a big backport merge at a later date or (b) open the conflicting PR automatically so the one who has made the code has to jump in and fix it. What about the 1%? So yes, merging does not always succeed from the release branch to the development branch. In this manner all branches stay up to date and functional, developers can actually develop (and not worry about the process) and we will have less errors. By also copying the original PR body and merging into the development branch issues that are marked as "fixed" in the original PR will automatically be closed by GitHub without human intervention (which is also completely manual right now). The jenkins-ci user can then automatically apply this merge in 99% of the cases (I'll get to the other 1% in a bit) and automatically open a PR for this change with the original PR body onto the development branch.GitHub supports webhooks which allow our Jenkins machine to see when a new commit has been pushed to the release branch. To get rids of these types of errors and consequently having to fix the same bug twice we should automate as much as possible: This comes at the cost of the sanity of whomever has to actually perform this merge and invariably leads to errors, such as these: However, applying fixes from the release branch to the development branch has to be done manually. As per the git flow model fixes are made onto the latest release branch and then also merged into the development branch. Tribler has had a release and a development branch for many years now.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |