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 have a problem during merging two branches.
Consider the following git history structure:
A---B---C feature
/(1) /(2)
D---E---F---G master
And I need to merge ‘feature’ branch in point (1) and (2).
(1) merged without any problems, but the second one shows
warning: refname 'feature' is ambiguous
Already up-to-date.
Could you help me, please? Thanks.
Solved. The problem was in tag with name ‘feature’ 🙂
You have to be on master to issue
git merge feature.