What’s going on with the line that split out on it’s own? I did a commit and then I did a pull for the repository and then an update.
What caused this?
How do I get that split part back into the main line?
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.
What’s going on with the line that split out on it’s own? I did a commit and then I did a pull for the repository and then an update.
What caused this?
How do I get that split part back into the main line?
The split is a new branch. You can merge it back to the trunk if you like, though beware of borked code. To do the merge, select the tip of the new branch, bring up the context menu, and select Merge With. It will merge with whatever Rev is currently tagged as
tip.