git - How to abandon changes? -


i work openssl's git repo. 1 of things test changes against clean copy issuing make clean; make dclean.

when performs git pull, git fails because of developer cruft that's removed dclean (see below). when fails, git tells me "commit changes or stash changes...". i'm not interested in committing, saving or stashing them. rather, i'd abandon them.

git abandon not command. command abandon changes?

a related question how discard unstaged changes in git?. answer stash them (if read question, see none of answers answers question). i'm not interested in stashing or saving them. want abandon them can git pull , go work.

$ git pull remote: counting objects: 2069, done. remote: compressing objects: 100% (872/872), done. remote: total 2069 (delta 1022), reused 589 (delta 589), pack-reused 608 receiving objects: 100% (2069/2069), 3.13 mib | 1.59 mib/s, done. resolving deltas: 100% (1272/1272), done. https://github.com/openssl/openssl    c40dba9..e0f9bf1  master     -> origin/master    8a09500..d8a2353  openssl-fips-2_0-dev -> origin/openssl-fips-2_0-dev    155ca14..f16093d  openssl_0_9_8-stable -> origin/openssl_0_9_8-stable    690d040..aaa654d  openssl_1_0_0-stable -> origin/openssl_1_0_0-stable    76b49a8..cc74177  openssl_1_0_1-stable -> origin/openssl_1_0_1-stable    c59bd61..4d9dc0c  openssl_1_0_2-stable -> origin/openssl_1_0_2-stable  * [new tag]         openssl-fips-2_0_9 -> openssl-fips-2_0_9 updating c40dba9..e0f9bf1 error: local changes following files overwritten merge:     crypto/aes/makefile     crypto/asn1/makefile     crypto/bf/makefile     crypto/bio/makefile     crypto/buffer/makefile     crypto/camellia/makefile     crypto/cast/makefile     crypto/cmac/makefile     crypto/cms/makefile     crypto/conf/makefile     crypto/des/makefile     crypto/dh/makefile     crypto/dsa/makefile     crypto/dso/makefile     crypto/ecdh/makefile     crypto/ecdsa/makefile     crypto/engine/makefile     crypto/err/makefile     crypto/evp/makefile     crypto/hmac/makefile     crypto/idea/makefile     crypto/lhash/makefile     crypto/md4/makefile     crypto/md5/makefile     crypto/mdc2/makefile     crypto/modes/makefile     crypto/ocsp/makefile     crypto/pem/makefile     crypto/pkcs12/makefile     crypto/pkcs7/makefile     crypto/pqueue/makefile     crypto/rand/makefile     crypto/rc2/makefile     crypto/rc4/makefile     crypto/ripemd/makefile     crypto/seed/makefile     crypto/sha/makefile     crypto/srp/makefile     crypto/stack/makefile     crypto/ts/makefile     crypto/txt_db/makefile     crypto/ui/makefile     crypto/whrlpool/makefile     crypto/x509/makefile     engines/makefile please, commit changes or stash them before can merge. aborting

to sync head, it's

git reset --hard head

Comments

Post a Comment

Popular posts from this blog

node.js - Using Node without global install -

i'm working on few node & electron (atom shell) projects , i'm curious how them work without user having install node globally. i've seen few applications including node directory in project contains node.exe binary. how go setting node project use binary? edit: thought should add, i've searched everywhere answer this, unrelated results.
Read more

How to access a php class file from PHPFox framework into javascript code written in simple HTML file? -

i've website developed using phpfox v3.0.7 . now i'm trying implement 'sse(server sent events)' 1 of php files. reference i'm giving below necessary code part of file. file titled process.class.php , present @ location /var/www/module/notification/include/service/process.class.php present on server having ip http://34.124.40.142/ . <?php /** * [phpfox_header] */ header('content-type: text/event-stream'); header('cache-control: no-cache'); defined('phpfox') or exit('no dice!'); /** * * * @copyright [phpfox_copyright] * @author raymond benc * @package phpfox_service * @version $id: service.class.php 67 2009-01-20 11:32:45z raymond_benc $ */ class notification_service_process extends phpfox_service { /** * class constructor */ public function __construct() { $this->_stable = phpfox::gett('notification'); } public function add($...
Read more

java - Null response to php query in android, even though php works properly -

Image
table i'm trying retrieve above data using 2 php files below. want pass email parameter , return bets user = email. work fine when tested advanced rest client, problem not php. however, when try through android 2 java classes below, null pointer exception (logcat below) , json object returned null. i'm not sure error is, think i'm not passing parameter php , that's why it's producing null response. logcat 05-31 15:10:50.227 26074-26074/com.example.albert.betterapp e/androidruntime﹕ fatal exception: main process: com.example.albert.betterapp, pid: 26074 java.lang.runtimeexception: unable start activity componentinfo{com.example.albert.betterapp/com.example.albert.betterapp.displayallbets}: java.lang.nullpointerexception @ android.app.activitythread.performlaunchactivity(activitythread.java:2292) @ android.app.activitythread.handlelaunchactivity(activitythread.java:2350) @ android.app.activitythread.acce...
Read more