[GeoNetwork-devel] Git contributors merge strategy

just re-sending this with adjusted mail subject, maybe get more attention

So are most of us :slight_smile:

Good question: do we expect contributors to issue pull requests on a release branch only, or also on Master (formerly known as trunk) ?

Seems to me it would be less work for Geonetwork committers if the contributors do pull requests for both the current release branch and for Master. But from the description below it looks like Jesse plans on doing the pulling to Master himself.

What will be our strategy in this ?

Kind regards
Heikki Doeleman

On Wed, Jun 27, 2012 at 12:55 PM, ianwallen <ianwallen@anonymised.com> wrote:

Sorry, I’m still learning the GIT process :slight_smile:

No, I don’t believe the changes are on the Master - I can send a pull
request for that as well. However based on
http://osgeo-org.1560.n6.nabble.com/GeoNetwork-opensource-Developer-website-954-Not-translated-wrong-English-label-tc4981384.html
this discussion Jesse asked that I do a pull request for the 2.8 branch
rather than the Master and he can then easily merge the changes into the
Master.

Is it now suggested that we do a pull request for both the Master and the
branch? Do you still want me to do a pull request on the Master?

–
View this message in context: http://osgeo-org.1560.n6.nabble.com/GeoNetwork-opensource-Developer-website-932-new-line-issue-with-Oracle-scripts-tp4979808p4984187.html
Sent from the GeoNetwork developer mailing list archive at Nabble.com.


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/


GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork

I would say it depends on the fix. If the fix can be cherry-picked between branches then 1 pull request is enough. If the fix only applies to one branch or is hard to apply to both branches (because the branches have different code for the change) then I would say 2 pull requests would be best because it increases the changes of us merging the change to both branches. I think I speak for everyone when I say we are really busy and the less work we have to do for a change the more likely it will make it into the code base.

Jesse

On Wed, Jun 27, 2012 at 2:32 PM, heikki <tropicano@anonymised.com> wrote:

just re-sending this with adjusted mail subject, maybe get more attention

So are most of us :slight_smile:

Good question: do we expect contributors to issue pull requests on a release branch only, or also on Master (formerly known as trunk) ?

Seems to me it would be less work for Geonetwork committers if the contributors do pull requests for both the current release branch and for Master. But from the description below it looks like Jesse plans on doing the pulling to Master himself.

What will be our strategy in this ?

Kind regards
Heikki Doeleman

On Wed, Jun 27, 2012 at 12:55 PM, ianwallen <ianwallen@anonymised.com> wrote:

Sorry, I’m still learning the GIT process :slight_smile:

No, I don’t believe the changes are on the Master - I can send a pull
request for that as well. However based on
http://osgeo-org.1560.n6.nabble.com/GeoNetwork-opensource-Developer-website-954-Not-translated-wrong-English-label-tc4981384.html
this discussion Jesse asked that I do a pull request for the 2.8 branch
rather than the Master and he can then easily merge the changes into the
Master.

Is it now suggested that we do a pull request for both the Master and the
branch? Do you still want me to do a pull request on the Master?

–
View this message in context: http://osgeo-org.1560.n6.nabble.com/GeoNetwork-opensource-Developer-website-932-new-line-issue-with-Oracle-scripts-tp4979808p4984187.html
Sent from the GeoNetwork developer mailing list archive at Nabble.com.


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/


GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


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/


GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork