And I resolved this problem of git-pull resulting in a conflicted merge by using the commands:
$ git fetch origin $ git reset --hard origin _______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
