13 Sep
2011
13 Sep
'11
4:59 p.m.
Hello,
not a git expert, but if you tried to merge the branches, looks like it
failed. You can do 'git diff' and see if you have parts in between
'<<<', '===' and '>>>'. If yes, you can resolve
manually by deleting
the invalid parts and the delimiters of the parts, then 'git add' the
conflict files and commit.
Cheers,
Daniel
On 9/13/11 10:19 PM, Juha Heinanen wrote:
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
_______________________________________________
sr-dev mailing list
sr-dev(a)lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
--
Daniel-Constantin Mierla -- http://www.asipto.com
Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat
http://linkedin.com/in/miconda -- http://twitter.com/miconda