I have one issue when conflited local repository with remote repository. Remote repository and Local repository has "sample.txt" file. and each repository is same contents. ---sample.txt--- line1: line2: line3: line4: line5: ---(EOF)---
Remote "sample.txt" has been chanaged bellow, ---sample.txt@remote--- line1: line2: line3:SERVER line4: line5: ---(EOF)--- Local "sample.txt" has been changed like bellow, ---sample.txt@remote--- line1: line2: line3:CLIENT line4:CLIENT line5: ---(EOF)--- At first, I pushed "smaple.txt@remote" to remote repository Next, I fetched origin and merged FETCH_HEAD. Then, conflict occured like this... ---conflict--- line1: line2: <<<<<<< HEAD line3:CLIENT line4:CLIENT ======= line3:SERVER line4: >>>>>>> FETCH_HEAD line5: ---(EOF)--- I think line4 is not conflicted, but merge result shows conflict at line3 and line4. I want to get the merge result like following. ---conflict--- line1: line2: <<<<<<< HEAD line3:CLIENT ======= line3:SERVER >>>>>>> FETCH_HEAD line4:CLIENT line5: ---(EOF)--- Is it configuration problem? [Remote bare repository]git version 1.7.1 on CentoOS6.6 [Local repository]git version 1.9.4.msysgit.2 on Windows7 Thank you. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
