Tool use

  • Mercurial (project at https://bitbucket.org)

  • SourceTree

Set the file to non-trace state

Problem description

The project file was in a trace state, but now you want to set it to a non-trace state, meaning that no matter how you modify the file locally, it will not be tracked

The solution

  • Use the hg forget command to operate on the files that you want to set to a non-trace state

  • Add a record to.hgIgnore under the project

Merge the branch problem after setting up non-trace file operations on the branch

Problem description

Untracked file in working directory frights from file in requested revision that already exists in the current branch setting (meaning here for example develop) This file also exists) for a non-trace state

The solution

Suppose the current branch is A and the target branch (usually Develop) is B, jump to B, reset the non-trace state of the files on A on B, and merge again

advice

When you need to set a file to a non-trace state, it is best to do so on the trunk branch