Hi,
the GeoServer release scripts worked for the most part without
modifications,
but I'm finding an issue at the very end of the release publishing script.
After uploading the artifacts to sourceforge it tries to tag the release on
github,
but here is what I get:
Switched to branch 'rel_2.2.x'
M src/community/python/geoscript
Auto-merging src/wms/pom.xml
CONFLICT (content): Merge conflict in src/wms/pom.xml
Auto-merging src/wfs/pom.xml
CONFLICT (content): Merge conflict in src/wfs/pom.xml
Auto-merging src/web/wms/pom.xml
CONFLICT (content): Merge conflict in src/web/wms/pom.xml
Auto-merging src/web/wfs/pom.xml
CONFLICT (content): Merge conflict in src/web/wfs/pom.xml
Auto-merging src/web/wcs/pom.xml
CONFLICT (content): Merge conflict in src/web/wcs/pom.xml
Hum... hu?
Cheers
Andrea
--
==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more
information.
==
Ing. Andrea Aime
@geowolf
Technical Lead
GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 962313
mob: +39 339 8844549
http://www.geo-solutions.it
http://twitter.com/geosolutions_it
-------------------------------------------------------
------------------------------------------------------------------------------
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/
_______________________________________________
Geoserver-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
