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.
My master branch is now not up to date and when I pull from the release branch I get too many conflicts
how can I track the release branch and replacing the old code with the new one, I’ve tried the following :
git branch --track master ...
this doesn’t work because the master branch is already created.
git breanch --set-upstream master ...
didn’t work also,
i fixed my problem just by adding the -f to the track command