I am new at git and I use windows for git (that’s a lot of pain) , and now I’m having a merging trouble with conflict .class file. how should resolve this conflict? I don’t really understand about this conflict.
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I am new at git and I use windows for git (that’s a lot of pain) , and now I’m having a merging trouble with conflict .class file. how should resolve this conflict? I don’t really understand about this conflict.
I would say don’t even worry about resolving it. Just accept the merge, assuming the class file is the only conflict, using
git merge branch -XtheirsThis will merge as usual but accept all the changes from the branch you’re merging from without checking for conflicts.
Alternately you can resolve the conflict manually if it makes you feel better.
From this point on there will be no more conflicts with .class files as you’ve added an entry to .gitignore.