merge conflict
|
View:
New views
3 Messages
—
Rating Filter:
Alert me
|
 |
merge conflict
by Octavian Râşniţă
::
Rate this Message:
Hi,
I have tried an hg pull command and I need to do a merge with 2 heads. After giving the hg merge command, it gave a few merge conflicts. For example, a conflict in a file is looking like: requires 'Config::JFDI' => '0.064'; <<<<<<< local requires 'Template::Plugin::Date'; requires 'Template::Plugin::DateTime'; ======= requires 'Template::Plugin::Cache'; >>>>>>> other How should I solve this conflict if I want to have in the file both the 2 lines in a head and the other line found in the other head so the result should look like: requires 'Config::JFDI' => '0.064'; requires 'Template::Plugin::Date'; requires 'Template::Plugin::DateTime'; requires 'Template::Plugin::Cache'; I have tried to just delete the lines marked with <<<, >>> and === and then gave the command hg resolve but it gave again that merge error and hg inserted again those lines in the source file. I have made again the correction and then I tried to do: hg commit File_name but hg told that I can't do a commit in the middle of an unresolved merge. Help! Thank you. -- Octavian _______________________________________________ Mercurial mailing list Mercurial@... http://selenic.com/mailman/listinfo/mercurial |
|
|
Re: merge conflict
by Aaron Bingham-4
::
Rate this Message:
hg resolve --mark filename
2009/10/28 Octavian Râşniţă <orasnita@...>: > Hi, > > I have tried an hg pull command and I need to do a merge with 2 heads. After > giving the hg merge command, it gave a few merge conflicts. > > For example, a conflict in a file is looking like: > > requires 'Config::JFDI' => '0.064'; > <<<<<<< local > requires 'Template::Plugin::Date'; > requires 'Template::Plugin::DateTime'; > ======= > requires 'Template::Plugin::Cache'; >>>>>>>> other > > How should I solve this conflict if I want to have in the file both the 2 > lines in a head and the other line found in the other head so the result > should look like: > > requires 'Config::JFDI' => '0.064'; > requires 'Template::Plugin::Date'; > requires 'Template::Plugin::DateTime'; > requires 'Template::Plugin::Cache'; > > I have tried to just delete the lines marked with <<<, >>> and === and then > gave the command > > hg resolve > > but it gave again that merge error and hg inserted again those lines in the > source file. > > I have made again the correction and then I tried to do: > > hg commit File_name > > but hg told that I can't do a commit in the middle of an unresolved merge. > > Help! > > Thank you. > > -- > Octavian > > _______________________________________________ > Mercurial mailing list > Mercurial@... > http://selenic.com/mailman/listinfo/mercurial > -- Aaron Bingham / Software Engineer / bingham@... / +41 (44) 668 1380 Google Switzerland GmbH / Brandschenkestrasse 110 / CH-8002 Zurich / Switzerland _______________________________________________ Mercurial mailing list Mercurial@... http://selenic.com/mailman/listinfo/mercurial |
|
|
Re: merge conflict
by peso
::
Rate this Message:
2009/10/28 Octavian Râşniţă <orasnita@...>:
> Hi, > > I have tried an hg pull command and I need to do a merge with 2 heads. After > giving the hg merge command, it gave a few merge conflicts. > > For example, a conflict in a file is looking like: > > requires 'Config::JFDI' => '0.064'; > <<<<<<< local > requires 'Template::Plugin::Date'; > requires 'Template::Plugin::DateTime'; > ======= > requires 'Template::Plugin::Cache'; >>>>>>>> other > > How should I solve this conflict if I want to have in the file both the 2 > lines in a head and the other line found in the other head so the result > should look like: > > requires 'Config::JFDI' => '0.064'; > requires 'Template::Plugin::Date'; > requires 'Template::Plugin::DateTime'; > requires 'Template::Plugin::Cache'; > > I have tried to just delete the lines marked with <<<, >>> and === and then > gave the command > > hg resolve > > but it gave again that merge error and hg inserted again those lines in the > source file. > > I have made again the correction and then I tried to do: > > hg commit File_name > > but hg told that I can't do a commit in the middle of an unresolved merge. > > Help! You are searching for the command hg resolve -m [FILE] To see the files that are marked use hg resolve -l The help text to resolve may not be completely clear, but if offers some explanation of the command hg help resolve A little example can be found at http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html Regards, Peer _______________________________________________ Mercurial mailing list Mercurial@... http://selenic.com/mailman/listinfo/mercurial |
| Free embeddable forum powered by Nabble | Forum Help |
