On Sun, 2012-04-22 at 17:21 +0300, Andrew wrote:
> Hi all.
> I noticed that there are manually applied software updates into both
> next and 4.2 branch, which will cause merge conflicts in future merging
> of branches. It'll be not a big trouble, but it'll be better done by
> usual merge (git merge <repo>/<branch>, for ex., git merge BuC/master).
Thanks Andrew. I'm getting the hang of Git, slowly... :-)
Just to make sure I understand properly: if we want to make changes to
BuC 4.x which we *also* want to include in BuC 5.x ('next') then the
preferred procedure is to:
- Apply the change to the 4.x (master) branch
- Merge the master branch with the 5.x (next) branch
Is that right?
david
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel
