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
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@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
On Tuesday 13 September 2011, Daniel-Constantin Mierla wrote:
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.
Hi,
AFAIK there is also a GUI frontend, it can be called with 'git mergetool'. Maybe its easier this way.
Best regards,
Henning
-
Daniel-Constantin Mierla -
Henning Westerholt -
Juha Heinanen