Hello.
Sometimes merging your changes with changes of other people you may encounter a problem when hg cannot merge a file and displays the following error:
This often happens with binary files, but if it happens with a text file, you are in trouble, because you definitely do not want to merge big files by yourself.
Under the cut I'll show a simple solution for this.
In our project Mercurial unexpectedly declined to merge sources of ASMX web-service in C#. The extension of the file was asmx.cs.
To fix this problem I added the following lines to your Mercurial config file:
Mercurial config file is located here:
~/Mercurial.ini (Windows)
~/.hgrc
This fixed the problem.
Good luck.
This type of spot genuinely affords the handy remote control show up goods made available on the net. Although folks defined we're able to state-of-the-art one-up synthesiss here, My own loved one and also i appeared being video clip exceptional connected with anything you recommended. Consecrate folks pertaining to midst we all to the organize. Fluid Mechanics 1
ReplyDelete
ReplyDeleteVery excellent post.The knowledge you have been sharing through this post is very helpul to bring up new ideas and to innovate big things.I suggesst everyone to go through this blog,you not only get knowledge on it but enjoy reading the post.Thanks for sharing.
Python Certification Course in Bangalore