btw i noticed that you had already merged your changes to the product-emm in wso2-dev github account.
On Fri, Mar 28, 2014 at 11:10 AM, Niranjan Karunanandham <[email protected]>wrote: > Hi Chan, > > I had a look [1] and noticed that according to the git flow model the > hotfix branch gets deleted after it gets merged to the master and develop > branches. But there can be scenarios where the hotfix can be merge to > master but not to develop branch. In the develop branch a proper fix is > done or another feature or fix has corrected the issue. So i think it would > be better if the hotfix branches are present till the end of next version > release. Also in git flow, the other supporting branches (feature, release) > are also removed once it is merged with the master and develop branch. > > > [1] - https://github.com/dulichan/product-emm > > > > On Fri, Mar 28, 2014 at 10:51 AM, Chan <[email protected]> wrote: > >> Folks - can you please check my fork [1]?. I followed the gitflow model >> and git flow tool[2]. >> >> Cheers~ >> >> [1] - https://github.com/dulichan/product-emm >> [2] - https://github.com/nvie/gitflow/tree/master >> >> >> On Fri, Mar 28, 2014 at 10:07 AM, Chan <[email protected]> wrote: >> >>> +1 to the rename suggestion. I did the renaming but I am experimenting >>> on the git rebase command and the usefulness of it instead of using >>> merging. What I did was rebase the hotfix-ip-address branch to develop. >>> Then rebase the hotfix-ip-address branch to master as well. >>> >>> Apparently the above approach has couple of pitfalls. It's never >>> recommended to rebase code on something that's already pushed to remote >>> repositories [1]. (The above commit I did is harmless because there were no >>> commits that happened between my commit). Guys there is an extension made >>> called git flow that can be installed on to git to manage git flow easily >>> [2]. Another note to make is prefixing happens with / not - (eg:- >>> hotfix/ip-address). >>> >>> [1] - >>> http://jeffkreeftmeijer.com/2010/the-magical-and-not-harmful-rebase/ >>> [2] - https://github.com/nvie/gitflow/tree/0.2 >>> >>> >>> On Fri, Mar 28, 2014 at 9:19 AM, Niranjan Karunanandham < >>> [email protected]> wrote: >>> >>>> Instead of having the branch as ip-address-fix, name it >>>> hotfix-ip-address so that when looking at the branches it can be quickly >>>> identified as a fix branch.. >>>> On 28 Mar 2014 09:15, "Chan" <[email protected]> wrote: >>>> >>>>> +1 I was doing that. I have created a branch called develop and a >>>>> branch called ip-address-fix. The ip-addess-fix will be merged to the >>>>> develop branch and master branch after finishing. Then I'll push a tag to >>>>> master on the 1.0.0 release as well. (All pushing will happen to dev >>>>> remote). >>>>> >>>>> Cheers~ >>>>> >>>>> >>>>> On Fri, Mar 28, 2014 at 9:07 AM, Niranjan Karunanandham < >>>>> [email protected]> wrote: >>>>> >>>>>> Do not directly commit it to the develop.. get a tag from the master >>>>>> and put your fix (hotfix) and then merge it into master and develop.. the >>>>>> reason is that the ip related changes is a fix you did after the release. >>>>>> On 28 Mar 2014 08:44, "Chan" <[email protected]> wrote: >>>>>> >>>>>>> Hi folks, >>>>>>> I am starting work on the product-emm (new fork at dev repo). For >>>>>>> reference I made 3 remotes for my local repo - >>>>>>> >>>>>>> official - WSO2 Organization Repo >>>>>>> dev - WSO2 Dev repo >>>>>>> own - WSO2 Fork >>>>>>> >>>>>>> I'll be committing of the ip related changes to dev. >>>>>>> >>>>>>> Cheers~ >>>>>>> >>>>>>> -- >>>>>>> Chan (Dulitha Wijewantha) >>>>>>> Software Engineer - Mobile Development >>>>>>> WSO2Mobile >>>>>>> Lean.Enterprise.Mobileware >>>>>>> * ~Email [email protected] <[email protected]>* >>>>>>> * ~Mobile +94712112165 <%2B94712112165>* >>>>>>> * ~Website dulitha.me <http://dulitha.me>* >>>>>>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>>>>>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Chan (Dulitha Wijewantha) >>>>> Software Engineer - Mobile Development >>>>> WSO2Mobile >>>>> Lean.Enterprise.Mobileware >>>>> * ~Email [email protected] <[email protected]>* >>>>> * ~Mobile +94712112165 <%2B94712112165>* >>>>> * ~Website dulitha.me <http://dulitha.me>* >>>>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>>>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>>>> >>>> >>> >>> >>> -- >>> Chan (Dulitha Wijewantha) >>> Software Engineer - Mobile Development >>> WSO2Mobile >>> Lean.Enterprise.Mobileware >>> * ~Email [email protected] <[email protected]>* >>> * ~Mobile +94712112165 <%2B94712112165>* >>> * ~Website dulitha.me <http://dulitha.me>* >>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>> >> >> >> >> -- >> Chan (Dulitha Wijewantha) >> Software Engineer - Mobile Development >> WSO2Mobile >> Lean.Enterprise.Mobileware >> * ~Email [email protected] <[email protected]>* >> * ~Mobile +94712112165 <%2B94712112165>* >> * ~Website dulitha.me <http://dulitha.me>* >> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >> > > > > -- > > *Niranjan Karunanandham* > Senior Software Engineer - WSO2 Inc. > WSO2 Inc.: http://www.wso2.com > M: +94 777 749 661 <http:///> > -- *Niranjan Karunanandham* Senior Software Engineer - WSO2 Inc. WSO2 Inc.: http://www.wso2.com M: +94 777 749 661 <http:///>
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
