git - Revert a Pull Request on master after other commits -

-

similar undo merge pull request? master has many many commits ahead of pull request. way undo old pull request correctly? cherry picking work in case somehow?

note: pushed , not local.


Comments

Post a Comment

Popular posts from this blog

c - ALSA programming: how to stop immediately -

-
i building audio app playback , stop features. function playaudio() playback, stopaudio() stop. expected file format wav. the main implementation of playaudio() below: playaudio() { ... ... int err = snd_pcm_open(&handle, "default", snd_pcm_stream_playback, 0); if ( err < 0 ) { printf("scm open failed: %s\n", snd_strerror(err)); exit(err); } while ( 0 < numofframes) { ... ... ssize_t frames = snd_pcm_writei(handle, &buffer[0], periodsize); ... ... } snd_pcm_drain(handle); snd_pcm_close(handle); } stopaudio() { snd_pcm_drop( m_handle ); } while audio playing back, program blocked @ line of snd_pcm_drain(handle); until playback completion. during period, expect stop audio play. action click stop button on ui , call snd_pcm_drop( m_handle ) finally. voice stopped, programm running still staying @ line of snd_pcm_drain(handle) untils several seconds later...
Read more

c++ - How to add Crypto++ library to Qt project -

-
Image
i downloaded crypto++ source , compiled cryptlib project in visual studio 2013, , added generated .lib file qt project, made .pro file this: qt += core gui qt += sql greaterthan(qt_major_version, 4):qt += widgets target = untitled template = app sources += main.cpp\ mainwindow.cpp headers += mainwindow.h \ databasecontrol.h \ test.h forms += mainwindow.ui win32:config(release, debug|release): libs += -l$$pwd/ -lcryptlib else:win32:config(debug, debug|release): libs += -l$$pwd/ -lcryptlibd else:unix: libs += -l$$pwd/ -lcryptlib includepath += $$pwd/ dependpath += $$pwd/ win32-g++:config(release, debug|release): pre_targetdeps += $$pwd/libcryptlib.a else:win32-g++:config(debug, debug|release): pre_targetdeps += $$pwd/libcryptlibd.a else:win32:!win32-g++:config(release, debug|release): pre_targetdeps += $$pwd/cryptlib.lib else:win32:!win32-g++:config(debug, debug|release): pre_targetdeps += $$pwd/cryptlibd.lib else:unix: pre_targetdeps += $$pw...
Read more