All geek questions in one place

How to prevent automatic file merge when switching branches in Mercurial?

Say I have two branches with the name defaultand newfeature. I have a file with a name readme.txtin both branches. I am working on a branch newfeatureand I am making changes to readme.txt. If I run hg up defaultwithout making a change, Mercurial automatically merges readme.txt's version newfeaturedirectly into default.

How can I change this behavior? I'm worried that the developers forget to complete the transaction before they switch branches, thereby merging everything they worked on.

Here's what the process looks like:

C:\source\BranchTest\Main>hg branch
Exams

C:\source\BranchTest\Main>hg status
M readme.txt

C:\source\BranchTest\Main>hg up default
merging readme.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved

C:\source\BranchTest\Main>

Pay attention to automatic merging, because I did not commit the readme.txt change. Mercury does not warn me that this will happen.

Any suggestions?

+3
1

hg up -c ( "c" ). .

hgrc.

+5

Source: https://habr.com/ru/post/1758080/

More articles:


All Articles