On 16 March 2015 at 13:11, Vadim Zeitlin <vz-s...@zeitlins.org> wrote: > On Sun, 15 Mar 2015 20:31:12 -0700 Pawel Aleksander Fedorynski > <pfe...@gmail.com> wrote: > > PAF> I don't really understand the implications of what you're asking for, > > Sorry, let me try to explain it better: when somebody creates a pull > request for SOCI repository, currently it defaults to the master branch. > This is wrong as all the changes are supposed to be done in the develop > branch instead.
This is not entirely precise, so let me clarify two things here: 1. "all the changes", it depends what changes. In the workflow I decided to follow, namely GitFlow, PRs that deliver bug fixes to released version should be based on the master, whereas PRs with new features should be based on the develop. 2. "are supposed to", that is only if we are (still) happy to follow the workflow I proposed, GitFlow. We can change to any workflow the majority will prefer. GitFlow is based on two branches: master == latest released version of SOCI develop == all new developments Thus, users, instead of downloading .tar.gz, can also checkout the master in order to get the latest release. That makes it easy for more advanced users to try SOCI and submit patches if they find any issues, without any extra checkout/configuration/build, etc. Finally, master as default seems a de-factor standard on GitHub (in GitFlow too), so switching branches may cause confusions. > PAF> but if Mateusz doesn't respond within a couple days or say a week, > PAF> I'll be happy to do it, especially if you give me instructions how. > > I've actually never done it myself as all my other repositories just use > "master" branch as the work one and don't use git flow, but AFAICS you just > need to click on the "Settings" (screwdriver and wrench icon) and change > the "Default branch" there. Yes, that's very simple to do. > FWIW this is not a drastic change, it will only affect future PRs and it > can always be undone, so I don't think Mateusz could have any objections to > it... I have no objections, just explained the rationale behind the master as default. If we all prefer to switch the default branch, we switch. Best regards, -- Mateusz Loskot, http://mateusz.loskot.net ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ soci-users mailing list soci-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/soci-users
