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.
Let’s say we have a base repository R and a fork F. Coders are still making changes in R and F needs to include these changes as they are being added.
How do I tell hg to update F with the latest changes in R without losing the work I am doing on F?
Using the diff tool is a heck of a time-consuming task and it is not helping me move forward.
I am using TortoiseHG.
Are you aware of
merge? If you are and your issue is merge conflicts, then your diff tool is how you’ll need to proceed.The way to do this, assuming you are working locally on F and that the tip of F is your current working directory:
That’s it. If the changes in R and F don’t overlap, you should be done and ready to move on. If work in R and F both modify the same parts of the same files, you’ll need to use your diff tool to resolve those merge conflicts.