Skip to the content ForoHackers
Log inJoin

Git: Your local changes would be overwritten by checkout. Por una vez tiene toda la razón.

DebuggingDeveloper toolsVersion control
#16798 · · Quote · Report

git me dice "Your local changes ... would be overwritten by checkout". lo escribo desde la inhabitual posición de uno al que le acaban de impedir hacer una cagada real. tengo el texto de la pantalla de pausa a medio arreglar en la rama de música. ¿a qué santo se le deja el .diff?

#17077 · · Quote · Report

what do you want the music branch to remember after you've finished? I used to commit in place and mumble an apology at whoever found it six months later.

#17078 · · Quote · Report

nada. el arreglo era para la otra rama. en la copia desechable guardé el diff de esa ruta, comprobé que tenía el cambio, lo guardé temporalmente con stash y pude cambiar. el parche dice "reanudar", que ayer escribí "recaudar".

#17079 · · Quote · Report

Apply the stash on the destination and inspect the actual file. If it applies cleanly you've still got a chance to be wrong in an entirely new branch, my favourite sort of progress.

#17081 · · Quote · Report

lo revisé, prueba del botón y commit sólo en la rama de la pausa. la de música no aprendió a recaudar. el parche se queda archivado porque me ha dado un ataque de cariño por mi yo del martes.

You are not logged in, so this goes up anonymously: no account, no name and no address is stored with it, and it may carry no link and no image. Log in or join to post under your name. Our web server's logs keep the address and time of every request for up to 14 days; to keep yours out of them, use Tor. To reach the staff in confidence, use the drop. Sign as a returning source (a key kept only in this browser)

Sending takes a few seconds here: your browser first works out a proof of work against spam.

Reply