Samuel, Try git am --abort
Regards, Jonathan 2013/5/17 Samuel Desseaux <samuel.desse...@ecp.fr>: > Hi, > > As i'm not expert on git, i've a question. > > When i want to rebase to v3.12.00-rc2, i 've this "it looks git-am is in > progress, can't rebase" > > Can i solve it by doing a rm -rf .git/rebase-apply ? > > Best regards, > > Samuel > _______________________________________________ > Koha-devel mailing list > Koha-devel@lists.koha-community.org > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ _______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
