build update - The following untracked working tree files would be overwritten by merge

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

build update - The following untracked working tree files would be overwritten by merge

jody.garnett
One of the changes introduced during the sprint was including the contents of iso19115-3.2018 directly in master (rather than as a submodule).

If you update with git pull you will get the following error:

From github.com:geonetwork/core-geonetwork
 * branch                  master     -> FETCH_HEAD
 = [up to date]            master     -> upstream/master
error: The following untracked working tree files would be overwritten by merge:
schemas/iso19115-3.2018/ISO19115-3-2014-to-ISO19115-3-2018.xsl
schemas/iso19115-3.2018/ISO19139-to-ISO19115-3-2018.xsl

Here is how to update:

cd schemas
rm -r iso19115-3.2018
git pull
git checkout .

For more information:
--
Jody Garnett
--
--
Jody Garnett


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: build update - The following untracked working tree files would be overwritten by merge

Francois Prunayre
Thanks Jody for the update.

Also note that a couple of projects are still using metadata101 so don't be surprised that on my side some fixes will be applied to metadata101 and synch master from time to time - not sure what is best for this as we can't cherry-pick probably.

I'll try to do the move for 4.0.x branch soon.

At some point, we will have to archive the project on metadata101.

Francois


Le mar. 11 août 2020 à 07:26, Jody Garnett <[hidden email]> a écrit :
One of the changes introduced during the sprint was including the contents of iso19115-3.2018 directly in master (rather than as a submodule).

If you update with git pull you will get the following error:

From github.com:geonetwork/core-geonetwork
 * branch                  master     -> FETCH_HEAD
 = [up to date]            master     -> upstream/master
error: The following untracked working tree files would be overwritten by merge:
schemas/iso19115-3.2018/ISO19115-3-2014-to-ISO19115-3-2018.xsl
schemas/iso19115-3.2018/ISO19139-to-ISO19115-3-2018.xsl

Here is how to update:

cd schemas
rm -r iso19115-3.2018
git pull
git checkout .

For more information:
--
Jody Garnett
--
--
Jody Garnett
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork