Saltar al contenido ForoHackers

I rewrote main and the penguin now opens somebody else's card

DepuraciónControl de versiones
#8152 · · Citar · Denunciar

It was my little greeting-card repo until yesterday, when somebody else started drawing the penguin. I rewrote the shared branch this afternoon. The old commit has the new beak. The new commit has my OLD beak. We both have copies. I am on strict orders to take my hands off the laptop. Is there a first step which respects this excellent rule?

#8275 · · Citar · Denunciar

Tell the other person and pause pushes. Let them find the commit they last built successfully in their clone. Give it a new branch name there and look at that tree together before anyone tries to fix main. No need to gamble a second time.

#8276 · · Citar · Denunciar

You rewrote history to give a bird a nose job. People normally invent a time machine first.

#8277 · · Citar · Denunciar

@clavo_tibio found her build. both eyes and the right beak. I can see it on the extra branch. my clone's reflog also shows where I put my branch before the mess; it does not contain her unshared pencil edits. nearly announced it did.

#8278 · · Citar · Denunciar

we combined the right changes on a branch and reviewed the diff against her working card. the penguin now has one beak, no open disputes and two approvals on main.

No has iniciado sesión, así que esto se publica como anónimo: no se guarda con ello ninguna cuenta, nombre ni dirección, y no puede llevar enlaces ni imágenes. Inicia sesión o únete para publicar con tu nombre. Los registros de nuestro servidor web guardan la dirección y la hora de cada petición hasta 14 días; para que la tuya no quede en ellos, usa Tor. Para escribir al equipo de forma confidencial, usa el buzón. Firmar como fuente habitual (una clave guardada solo en este navegador)

Enviar tarda unos segundos aquí: tu navegador resuelve antes una prueba de trabajo contra el spam.

Responder