Agaric Design Collective

Undo a conflicting change in your working copy that you didn't want anyway

By Benjamin Melançon
on 16 May
0 comments

Key words and phrases

git undo reset revert rewind repeal redo unset unwind expunge expunch conflict chain

Tags

Description

In short, resolve a conflict in favor of the outside repository.

The file can be a

mv offending.file ~/elsewhere
git checkout offending.file

See also for resetting everything: http://agaric.com/note/git-update-and-ignore-local-changes

References
http://bryan-murdock.blogspot.com/2007/07/git-revert-is-not-equivalent-t...

http://www.kernel.org/pub/software/scm/git/docs/git-reset.html

 
Post new comment
The content of this field is kept private and will not be shown publicly.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <blockquote> <h1> <h2> <h3> <h4> <h5> <h6> <small> <pre> <strike> <sub> <sup> <kbd> <s>
  • Lines and paragraphs break automatically.
  • Web page addresses and e-mail addresses turn into links automatically.
  • You may post code using <code>...</code> (generic) or <?php ... ?> (highlighted PHP) tags.

More information about formatting options

CAPTCHA
This question is for testing whether you are a human visitor and to prevent automated spam submissions.
Image CAPTCHA
Copy the characters (respecting upper/lower case) from the image.