Hi, Due to a mistake during commit cleanup we had to rewrite part of the history of the nbnxn_hybrid_acc branch. As a consequence, pulling from branches that track nbnxn_hybrid_acc will not work (it will result in conflicts) and a forced update will be required:
$ git branch nbnxn_hybrid_acc # current branch is tracking nbnxn_hybrid_acc! $ git remote update [...] $ git reset --hard origin/nbnxn_hybrid_acc Sorry for the inconvenience! Cheers, -- Szilárd -- gmx-users mailing list [email protected] http://lists.gromacs.org/mailman/listinfo/gmx-users Please search the archive at http://www.gromacs.org/Support/Mailing_Lists/Search before posting! Please don't post (un)subscribe requests to the list. Use the www interface or send it to [email protected]. Can't post? Read http://www.gromacs.org/Support/Mailing_Lists
