[Xerte-dev] Re: develop to v3 update?

[Tom Reijnders]

This is one of the reasons that for fixes that you know need to into 
master as well should be done on a (new) branch (from master). Then it's 
easy to merge (both into master, and develop).

If you want specific fixes from develop into master, you cannot merge. 
You need to use cherry-picking, which sometimes can be very difficult, 
depending on the other stuff in develop.
I'll try give it a go this weekend.


Op 6-10-2015 om 11:33 schreef Ron Mitchell:
>
> I was looking at the difference between the change log for v3 update 
> and unstable on the community site. Unstable seems to contain fixes 
> that aren't in v3 update so I guess aren't merged into master if 
> master is what feeds the v3 update?
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk 
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of 
> *Julian Tenney
> *Sent:* 06 October 2015 10:25
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: develop to v3 update?
>
> Yes, we should be yes, but I thought anything in master got into the 
> zip? So it’s merging any critical changes in develop into master?
>
> *From:*xerte-dev-bounces at lists.nottingham.ac.uk 
> <mailto:xerte-dev-bounces at lists.nottingham.ac.uk> 
> [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Ron 
> Mitchell
> *Sent:* 06 October 2015 10:27
> *To:* 'For Xerte technical developers'
> *Subject:* [Xerte-dev] develop to v3 update?
>
> I was going to reply again to the thread about export issues on the 
> technical mailing list and suggest they update their installation to 
> the latest v3 update but I'm not certain that update on the community 
> site includes the fixes for including all media and/or correct links 
> on export?
>
> But then I also looked at the change log for develop in comparison and 
> there are obviously lots of changes, some of which are fixes, that 
> aren't yet merged with version 3 and so not in the update. Obviously 
> there are newer developments perhaps not ready for production use but 
> shouldn't we be ensuring that actual fixes do get merged regularly?
>
> Ron
>
> This message and any attachment are intended solely for the addressee
> and may contain confidential information. If you have received this
> message in error, please send it back to me, and immediately delete it.
> Please do not use, copy or disclose the information contained in this
> message or in any attachment.  Any views or opinions expressed by the
> author of this email do not necessarily reflect the views of the
> University of Nottingham.
> This message has been checked for viruses but the contents of an
> attachment may still contain software viruses which could damage your
> computer system, you are advised to perform your own checks. Email
> communications with the University of Nottingham may be monitored as
> permitted by UK legislation.
>
> This message and any attachment are intended solely for the addressee
> and may contain confidential information. If you have received this
> message in error, please send it back to me, and immediately delete it.
>
> Please do not use, copy or disclose the information contained in this
> message or in any attachment.  Any views or opinions expressed by the
> author of this email do not necessarily reflect the views of the
> University of Nottingham.
>
> This message has been checked for viruses but the contents of an
> attachment may still contain software viruses which could damage your
> computer system, you are advised to perform your own checks. Email
> communications with the University of Nottingham may be monitored as
> permitted by UK legislation.
>
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev

-- 
--

Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20151008/50e58b63/attachment.html>