Dependent Origination

how to quit a git merge

Posted on: January 17, 2014

git reset –hard HEAD

(this will discard all uncommitted changes in the current branch, which is the merge)

if you do have uncommited changes you care about, do a git stash and then a hard reset and then git stash pop

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

January 2014
M T W T F S S
« Dec   Feb »
 12345
6789101112
13141516171819
20212223242526
2728293031  

Twitter

  • is looking at other people's intentions, not their capabilities, and feeling much happier every day :) 11 months ago
  • is planning on how to spend the next two weeks until the new year, at home. 11 months ago
  • is going to have human company for Thanksgiving; a rare event for the past like twenty years. 1 year ago
  • living by myself again; a strange feeling in a bustling city with thirteen million people 1 year ago
  • just came back home after sixteen days on the road; when i set out, the plan was a mere three-day trip 1 year ago

Flickr Photos

IMG_3150

IMG_3175

IMG_3169

IMG_3139

IMG_3120

IMG_3111

IMG_3086

IMG_3079

IMG_3054

IMG_3048

More Photos
%d bloggers like this: