I just merged two branches in Mercurial and pushed the last commit to Kiln. However, when I look at the last commit on the kilnhg website, it only shows two small sections of a file that was manually merged. Is it just showing the parts that I merged myself since Mercurial couldn't automatically merge them for me? Because a lot more had changed than those two sections...
|
1
|
|
|||
|
|
|
1
|
Yes, it does seem like Kiln marks the changes I made myself. Because another branch just got automatically merged completely and I got this: This changeset represents a merge. Mercurial was able to merge all files automatically, and no new content was introduced. |
|||
|
