Hi David;

Am Freitag, 7. Februar 2014, 21:09:32 schrieb David M Brooke:
> Hi leaf-devel,
> 
> I've been busy with other things for a while and I haven't had much time
> for LEAF development. However there are a couple of new projects I'm
> doing with LEAF and some of the work is of general interest (though some
> of it probably isn't!).
> 
> Since I last did much LEAF development I understand there are some new
> Git working practices as per the Git Workflows wiki page, so I'd like to
> check I understand those before I mess things up.
> 
> I've just made a small change to samba for Trac ticket #93. That's a
> small bug-fix, so it belongs in "maint", right?

Yes. Great btw you fixed it that fast.

> What I did was:
>    - Created a new local branch (called "trac#93") based on "maint"
>    - Committed the code change against that new branch
>    - Merged the bugfix branch back into "maint" (with "--no-ff")
>    - Pushed the changes to the origin repo
>    - Deleted the local branch "trac#93"
> Was that right?

To me it looks and is mostly the same as I do.

> I also have a new Package (vnstat) which I'd like to add. That's not a
> bug-fix, so should I create my feature branch off "master" rather than
> "maint"?

That's the way we intended it.

kp


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk

_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Reply via email to