Skip to the content ForoHackers
Log inJoin

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

DebuggingVersion control
#8152 · · Quote · Report

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 · · Quote · Report

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 · · Quote · Report

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

#8277 · · Quote · Report

@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 · · Quote · Report

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.

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