git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Wrong code on master

From
JDJonathan Duncan <jonathan@memoryties.com>
Date
Dec 24, 2011, 05:09 UTC
Message-ID
<36BFCDA4-8249-4965-877F-FFC9EA65C7EE@memoryties.com>
I have a developer that committed code that should have been on a branch.  I have created a branch now and locally my master branch is good to go.  However, when I try to push it conflicts, of course, because the repo still wants me to pull the changes and merge them to my master.
The new code from the other developer will eventually be used, but we were not ready for it to be on "master" yet.  I need to push my own code out before that other code gets used.
Will I really have to pull and merge the code to master and then revert?  I have been googling all day, trying to figure out the best way to do this and in the process I fear I have made a mess of my repo.  I have been using git long enough to be dangerous to myself.
Any thoughts?  Got a good article I can read?

Thanks, Jonathan

Next: Frans Klaver
Message 1 of 4 in “Wrong code on master”
  1. Jonathan DuncanDec 24, 2011
  2. Frans KlaverDec 24, 2011
  3. Jonathan DuncanDec 24, 2011
  4. Nathan W. PanikeDec 24, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.