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

How to ignore changes on remote

From
Howard Miller <howard@e-learndesign.co.uk>
Date
Mar 23, 2010, 13:54 UTC
Message-ID
<26ae428a1003230654m50c35caci4a02e2df321f289c@mail.gmail.com>

My remote branch has changes that are not fast forward (I forgot to merge). I have now made incompatible changes on my local branch. I simply want to use the local version and push it to the remote. I don't care about the remote version. I don't want to merge as there'll be loads of conflicts and the answer will always be 'use the local one'. Is there an easy way to do this? I can't think of anything.

Cheers!
Next: Sylvain Rabot
Message 1 of 14 in “How to ignore changes on remote”
  1. Howard MillerMar 23, 2010
  2. Sylvain RabotMar 23, 2010
  3. Howard MillerMar 23, 2010
  4. Alexander IljinMar 23, 2010
  5. Santi BéjarMar 23, 2010
  6. Howard MillerMar 23, 2010
  7. Sylvain RabotMar 23, 2010
  8. Scott ChaconMar 23, 2010
  9. Howard MillerMar 23, 2010
  10. Johannes SixtMar 23, 2010
  11. Johan HerlandMar 23, 2010
  12. Jakub NarebskiMar 23, 2010
  13. Johan HerlandMar 23, 2010
  14. Junio C HamanoMar 23, 2010

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.