On 15/03/2020 16:47, Claude Frantz wrote:
error: Your local changes to the following files would be overwritten
by merge:
macros/ax_pkg_swig.m4
Please commit your changes or stash them before you merge.
Aborting
Hi Claude,
unless you specifically edited macros/ax_pkg_swig.m4 for some reason I
suggest you run this command:
git checkout -- macros/ax_pkg_swig.m4
then try the 'git pull' again.
73
Bill
G4WJS.
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
