From: Jeff Garzik Date: Fri, 27 May 2005 03:48:48 GMT Subject: resolving merge conflicts? Message-ID: <429698A0.1020008@pobox.com> So is there a doc or something that describes how to resolve merge conflicts? Presumably I look at .merge_file_*, and make sure that all necessary changes make it into the copy of the file in the working directory... then what? How to continue the merge? Jeff > [...] > Adding drivers/net/bnx2.c with perm -x. > Adding drivers/net/bnx2.h with perm -x. > Adding drivers/net/bnx2_fw.h with perm -x. > Auto-merging drivers/net/ixgb/ixgb_main.c. > merge: warning: conflicts during merge > ERROR: Leaving conflict merge in .merge_file_fidvEd. > fatal: merge program failed > drivers/net/ixgb/ixgb_main.c: unmerged (7d26623d859278bd1ad6369648de9ed41a112493) > drivers/net/ixgb/ixgb_main.c: unmerged (a6af9d9e340865278cfe4b607efed9e56c087538) > drivers/net/ixgb/ixgb_main.c: unmerged (35f6a7c271a2be3a1f749716cbe27b1bffc66b98) > drivers/net/skfp/lnkstat.c: unmerged (00a248044f8683d104d55918fe5d003a3261fa41) > drivers/net/skfp/lnkstat.c: unmerged (00a248044f8683d104d55918fe5d003a3261fa41) > drivers/net/smc-mca.h: unmerged (ac50117a7e847dcdd12591267e04f67fb05fbbd4) > drivers/net/smc-mca.h: unmerged (ac50117a7e847dcdd12591267e04f67fb05fbbd4) > drivers/s390/net/ctcmain.h: unmerged (ba3605f16335dba918a656bb1b94589fb8008490) > drivers/s390/net/qeth_tso.c: unmerged (c91976274e7b007b78269e40fd8b354a4e888b86) > drivers/s390/net/qeth_tso.c: unmerged (c91976274e7b007b78269e40fd8b354a4e888b86) > ... > fatal: git-write-tree: not able to write tree