I’ve been doing some (mostly internal) development with SuiteCRM, and now I’m branching out and posting pull requests to the project. My first accepted pull request was just released with 7.10.6! Yay!
Anyway, I’m getting familiar with Git, as it works with upstream projects (I’ve been using it for years on my own one-man projects) and I have a question…
When I create a new branch to start developing a feature or a bug fix, which upstream branch should I base it on? Master? Hotfix? Something else? I’m trying to avoid merge conflicts when I post a pull request.