Hi Rostislav,
On Tue, Apr 22, 2014 at 10:07 AM, Rostislav Khlebnikov <
[email protected]> wrote:
> The issue is that suppose I work with the latest MITK release as I would
> like to have the most stable version. Now I want to contribute some bugfix
> to MITK. So if I make a branch from the MITK 'master' - it will be easy to
> contribute to MITK, but it would be a trouble integrating those changes to
> my own stable branch as the bugfix branch will also include the changes
> commited between the last release and current master head. And if I branch
> from my own 'stable' branch, then the pull request will contain the changes
> that are not only related to the bugfix. I approached that by basically
> creating a bugfix branch from the release tag - then the pull request is
> clean and the integration to my development branch is easy. This works very
> well for small changes, but it seems to me that it wouldn't work so well
> for larger contributions. Additionally, as the bugfix branch is made not
> from the current MITK master, some conflicts may appear that could be
> avoided by making a bugfix branch from the MITK master. Do you have any
> clean solutions for that issue in mind?
The cherry-picking approach works best for me because it's often easier to
for me to test/integrate the new feature or bug fix in my fork than in MITK
mainline. It works well enough for small to medium size changes. I think
large changes are just inherently difficult to manage in two diverged
branches (i.e. MITK mainline and a personal fork).
Thanks for the links - I started playing with some of the APIs in this Gist:
https://gist.github.com/nocnokneo/ea6a8420c7f524e3c935
Regards,
Taylor
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
mitk-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mitk-users
