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.
In my team, some we help each other with the merges.
I.e. my code is merged back to trunk by someone else.
It seems like the author info not is fully preserved during a merge. When I do annotate (blame) the merger is shown as the author.
Have the merger done something wrong or isn’t the original author preserved in a merge?
If your server does merge tracking and your client tools are version 1.5 or later, this will work: