Geek asks and answers

Merger with the furnace (mercury)

What is the best way to merge an oven with another repository.

we have 3 repositories

  • 1.7.5
  • 1.7.6
  • Primary-dev

Therefore, I am fixing the error in an older version (1.7.5). This is a fix that I would like to combine with version 1.7.6, the repository and in our main-dev repository.

How do I do this with a mercury (oven)

+3
source share
1 answer

Kiln does not provide functionality that allows merging through the Kiln web interface. Therefore, you need to execute the usual Merurial merge locally, and then push the merged changes in Kiln. There are many posts on how to merge revisions in Mercurial, including the good ones in Kiln Stackexchange:

+3

More articles:


All Articles