is this conflict due to some git push done to master recently: $ eg pull --branch master [email protected]'s password: >From ssh://git.sip-router.org/sip-router * 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.
if so, how to fix the conflict? -- juha _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
