Re: [mantisbt-dev] greetings, new here

[Damien R. <dr...@ma...>]

Brian Lamb <bl@...> writes:
> Can you clarify this part please:
> "For anything that is not a bugfix, please make sure you base your
> patches against the *master* branch. [...]
> 
> So if its not a bug fix, have fix applied to clean chekout of base 
> master, patch that right?  And if it IS a big fix what? branch it, 
> base the patch on the branch fix?

My thinking was that you have been working with Mantis 1.2 since you 
mentioned tweaks going back 3 years.

The reason for my comment is that 1.2 branch is in a feature freeze, we're 
only applying bug fixes and security patches to it. The focus of 
development is on release 1.3 (master branch).

Consequently, if you'd like to submit a new feature, you should indeed 
fork our repo on Github, create a new branch based on master (git checkout 
-b feature master) and send us a pull request with your changes.

To submit a bugfix for the current release, the process is the same, 
except you'd be basing your branch off 1.2 (git checkout -b bugfix master-
1.2.x). This is independent from the size of the patch.

Hope this clarifies.