Look, this isn't so good:
How may we prevent this and keep the trunk changes at the left consistently and the branch changes off to the right? In TortoiseHG when you are either ready to shove a local commit to your branch or you just want to get the trunk changes in line with your own code, you may see a scenario like so in which the trunk changes sit to the right, detached from your own head.
Right-click on the trunk's head. There will be an option for updating to main line. Do it. You will get something like so:
Then get latest from the trunk. Alright, now your own stuff sits to the right of the main line with a detached head.
Right click on the head and pick the merge option.
Everything should be happy now.
No comments:
Post a Comment