8 Sep
2011
8 Sep
'11
8:45 p.m.
Alex Hermann writes:
You'd first have to pull master in jh/mtree, push
that out to origin,
and then pull that into local jh.
alex,
what would that mean in terms of eg or git commands?
in 'jh', i tried 'eg pull --branch master', but it failed miserably:
$ eg pull --branch master
jh(a)git.sip-router.org's password:
*
branch master -> FETCH_HEAD
CONFLICT (directory/file): There is a directory with name pkg/kamailio/gentoo in HEAD.
Adding pkg/kamailio/gentoo as
pkg/kamailio/gentoo~5ecd7deddc7a6fb23f8d0bb530be3e68672c495d
Removing pkg/kamailio/gentoo/kamailio-1.2.0.ebuild
Removing pkg/kamailio/gentoo/kamailio.init
Removing pkg/ser/gentoo/ser-0.8.10.ebuild
Removing pkg/ser/gentoo/ser-0.8.11.ebuild
Removing pkg/ser/gentoo/ser-0.8.12.ebuild
Removing pkg/ser/gentoo/ser-0.8.14.ebuild
Removing pkg/ser/gentoo/ser-0.8.9.ebuild
Removing pkg/ser/gentoo/ser.init
Automatic merge failed; fix conflicts and then commit the result.
-- juha