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 was looking at the log in Tortoise, and this message is there
Commit:ab77ac9ca5264c531586ad9c5f007395d3e7ae9b
and also “Diff with parent 1” and “Diff with parent 2” not sure what I should do.
Should I just run the merge option in Tortoise?
the log indicates that somebody (e.g. you) already did a merge.
this is what happens, if your local branch diverges from a tracked branch and you “pull” from the diverged upstream.
git will try to automatically merge your branch and the pulled branch, that’s where you get the generic log message from.
in general, you should inspect any changesets coming from outside and which you don’t trust 100% before merging them.