- October 24, 2011
- 261
- 207
- 43
- Thread starter
- #91
OK I just tried some things to get the Bug & Feature to merge cleanly together. The only thing I can come up with is that I need to manually merge them together for the sake of the feature.
The feature itsself has to include the bug fix from what I can tell. You can still merge them into 1.3.0 separately, but I need to do a merge of the bug fix into the feature so that I can be sure that you end up with buildable code when you do an automerge no matter what order the two branches get merged into the main code.
arion_p, Maybe I can catch you on IRC tonight and we can talk about it. Thanks for the guidance.
I deleted the test branch. I will also build out the skin files.
Thanks,
Matt
The feature itsself has to include the bug fix from what I can tell. You can still merge them into 1.3.0 separately, but I need to do a merge of the bug fix into the feature so that I can be sure that you end up with buildable code when you do an automerge no matter what order the two branches get merged into the main code.
arion_p, Maybe I can catch you on IRC tonight and we can talk about it. Thanks for the guidance.
I deleted the test branch. I will also build out the skin files.
Thanks,
Matt