Hi folks. just for the register, my problem was that I didn't have a default
mergetool configured. After I installed meld and configured it properly
within git, the conflicts were all solved and the merge was sucessful.

Thanks :)

Daniel Trezub

On 3 February 2011 14:32, Daniel Trezub <daniel...@gmail.com> wrote:

> Hi, folks.
> I am developing a website using Wordpress and a bunch of plugins.
> I have two local branches "master" and "layers". "Master" is my public
> release, that I upload to my servers and that goes live to the internet.
> "Layers" is a development branch, that I merge to Master when I reach some
> important point.
> >git checkout layers
> Everything is working fine with my changes.
> >git checkout master
> Everything is working fine, too.
>  >git merge layers
> There is a conflict in just one file.
> >git mergetool
> It tells me that there is nothing to change (or the file was not changed at
> all, I don´t remember).
> After asking me if the merge was successful, I answered YES.
> Then my site is not working anymore.
> If I get back to the commit just after the merge (in both master and
> layers), everything is fine.
> My question is: Will "git bisect" help me? I don´t think so, since the bad
> commit is the merge one, and the good commit is the last commit after the
> merge.
> What can I do to find what´s wrong?
> How can I undo the merge, so I do not loose my two commits?
> Am I doing something wrong?
> Thanks for your help!
> =====
> Daniel Trezub
> http://www.gameblogs.com.br

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to