I've not used grass in a long time and want to update my source code to the current dev status as I've done before. But, there's a merge issue I need to learn how to resolve. My attempt: $ git pull error: Your local changes to the following files would be overwritten by merge: Dockerfile contributors.csv display/d.legend.vect/draw.c doc/development/submitting/python.md doc/development/submitting/submitting.md doc/development/submitting/submitting_c.md doc/gui/wxpython/example/frame.py doc/infrastructure.md doc/python/raster_example_ctypes.py docker/alpine/Dockerfile docker/alpine/Dockerfile_alpine_latest docker/debian/Dockerfile docker/ubuntu/Dockerfile docker/ubuntu_wxgui/Dockerfile gui/wxpython/animation/nviztask.py gui/wxpython/animation/temporal_manager.py gui/wxpython/core/gconsole.py gui/wxpython/core/globalvar.py gui/wxpython/core/menutree.py gui/wxpython/core/settings.py gui/wxpython/core/toolboxes.py gui/wxpython/core/utils.py gui/wxpython/core/workspace.py gui/wxpython/core/ws.py gui/wxpython/datacatalog/tree.py gui/wxpython/dbmgr/base.py gui/wxpython/dbmgr/dialogs.py gui/wxpython/dbmgr/sqlbuilder.py gui/wxpython/gcp/manager.py gui/wxpython/gmodeler/frame.py gui/wxpython/gmodeler/model.py gui/wxpython/gui_core/dialogs.py gui/wxpython/gui_core/forms.py gui/wxpython/gui_core/gselect.py gui/wxpython/gui_core/mapdisp.py gui/wxpython/gui_core/preferences.py gui/wxpython/gui_core/prompt.py gui/wxpython/gui_core/pyedit.py gui/wxpython/gui_core/treeview.py gui/wxpython/gui_core/vselect.py gui/wxpython/gui_core/widgets.py gui/wxpython/iclass/dialogs.py gui/wxpython/iclass/frame.py gui/wxpython/iclass/statistics.py gui/wxpython/iclass/toolbars.py gui/wxpython/icons/icon.py gui/wxpython/image2target/ii2t_manager.py gui/wxpython/iscatt/controllers.py gui/wxpython/iscatt/core_c.py gui/wxpython/iscatt/dialogs.py gui/wxpython/iscatt/frame.py gui/wxpython/iscatt/iscatt_core.py gui/wxpython/iscatt/plots.py gui/wxpython/iscatt/toolbars.py gui/wxpython/lmgr/frame.py gui/wxpython/lmgr/giface.py gui/wxpython/lmgr/layertree.py gui/wxpython/lmgr/statusbar.py gui/wxpython/lmgr/workspace.py gui/wxpython/location_wizard/wizard.py gui/wxpython/main_window/frame.py gui/wxpython/mapdisp/frame.py gui/wxpython/mapdisp/main.py gui/wxpython/mapswipe/frame.py gui/wxpython/mapwin/base.py gui/wxpython/mapwin/buffered.py gui/wxpython/modules/colorrules.py gui/wxpython/nviz/mapwindow.py gui/wxpython/nviz/tools.py gui/wxpython/nviz/wxnviz.py gui/wxpython/photo2image/ip2i_manager.py gui/wxpython/psmap/dialogs.py gui/wxpython/psmap/frame.py gui/wxpython/psmap/instructions.py gui/wxpython/startup/guiutils.py gui/wxpython/tools/build_modules_xml.py gui/wxpython/vdigit/mapwindow.py gui/wxpython/vdigit/toolbars.py gui/wxpython/vdigit/wxdigit.py gui/wxpython/vdigit/wxdisplay.py gui/wxpython/vnet/dialogs.py gui/wxpython/vnet/vnet_core.py gui/wxpython/vnet/vnet_data.py gui/wxpython/vnet/widgets.py gui/wxpython/web_services/dialogs.py gui/wxpython/web_services/widgets.py gui/wxpython/wxgui.py gui/wxpython/wxplot/base.py imagery/i.atcorr/geomcond.cpp imagery/i.atcorr/i.atcorr.html lib/bitmap/bitmap.c lib/init/grass.py lib/vector/Vlib/area.c lib/vector/Vlib/buffer2.c lib/vector/Vlib/build.c lib/vector/Vlib/build_sfa.c lib/vector/Vlib/close.c lib/vector/Vlib/copy.c lib/vector/Vlib/field.c lib/vector/Vlib/header.c lib/vector/Vlib/level_two.c lib/vector/Vlib/line.c lib/vector/Vlib/net_analyze.c lib/vector/Vlib/open.c lib/vector/Vlib/poly.c lib/vector/Vlib/read.c lib/vector/Vlib/read_ogr.c lib/vector/Vlib/simple_features.c lib/vector/Vlib/write.c lib/vector/Vlib/write_nat.c lib/vector/Vlib/write_pg.c locale/grass_po_stats.py locale/po/grasslibs_ar.po locale/po/grasslibs_bn.po locale/po/grasslibs_cs.po locale/po/grasslibs_de.po locale/po/grasslibs_el.po locale/po/grasslibs_es.po locale/po/grasslibs_fi.po locale/po/grasslibs_fr.po locale/po/grasslibs_hu.po locale/po/grasslibs_id_ID.po locale/po/grasslibs_it.po locale/po/grasslibs_ja.po locale/po/grasslibs_ko.po locale/po/grasslibs_lv.po locale/po/grasslibs_ml.po locale/po/grasslibs_pl.po locale/po/grasslibs_pt.po locale/po/grasslibs_pt_BR.po locale/po/grasslibs_ro.po locale/po/gra Aborting
Please advise me how to resolve this issue so I can keep sync'd with the source repo. TIA, Rich _______________________________________________ grass-user mailing list grass-user@lists.osgeo.org https://lists.osgeo.org/mailman/listinfo/grass-user