[sr-dev] git trouble

after daniel moved is_int from utils module to pv module, my branch jh/mtree stopped working. when i tried to switch to jh/mtree branch, i got

$ eg switch jh modules/utils/README: needs merge modules/utils/doc/utils_admin.xml: needs merge modules/utils/functions.c: needs merge modules/utils/functions.h: needs merge modules/utils/utils.c: needs merge error: you need to resolve your current index first

any idea what i need to do to make the branch usable again or do i just need to delete jh/mtree branch and crate a new one that includes the changes in jh/mtree branch?

-- juha