version control - How to restore changes from commit in git? -

-

this question has answer here:

i know there tons of questions this, none solution worked out me. here happened:

i tried add new feature in app, created new branch implement feature.
after done merged master, deleted branch tested new feature , pushed changes repository (bitbucket btw).
code normal.

then needed add other feature tho.
created new branch again, tested other new feature in master, , let other branch "right" code.

the new feature didn't work, tried going other branch , merging master, delete changes made, gave me merge conflict tho, tried everything, wasn't able it.

i switched master , deleted branch right code.
wrong code in master.
hadn't pushed changes yet, commited, tried searching on how fix this, none worked.

i ran command: git checkout number of commit

i checked last pushed commit, had right code.

my project changed right code, , thought ok, thought restored changes.

i ran git status , output:

head detached @ f49fb28 changes not staged commit: (use "git add <file>..." update committed) (use "git checkout -- <file>..." discard changes in working directory)  modified:   .ds_store modified:   homework.xcworkspace/xcuserdata/henrique.xcuserdatad/userinterfacestate.xcuserstate  no changes added commit (use "git add" and/or "git commit -a")

i ran git add -a along git commit -m "some message" , pushed repo thinking code there fixed. didn't tho, repo , project has same code, wrong code. possible checkout commit made right feature, not wrong 1 , code restores exact commit? if not, salvation redo everything.

please me!

edit: ran git status , output different now:

head detached f49fb28 changes not staged commit: (use "git add <file>..." update committed) (use "git checkout -- <file>..." discard changes in working directory)  modified:   homework.xcworkspace/xcuserdata/henrique.xcuserdatad/userinterfacestate.xcuserstate  no changes added commit (use "git add" and/or "git commit -a")

is possible checkout commit made right feature

first of read attached full answer in comments.

to summary can use git reflog checkout desired commit.

here how reflog like:

enter image description here


Comments

Post a Comment

Popular posts from this blog

html - Styling progress bar with inline style -

-
i trying set progress bar color red using inline style. need in way because have access <body> part of document. style need apply: progress { color: red } progress::-moz-progress-bar { background: red;} progress::-webkit-progress-value { background: red; } progress[aria-valuenow]:before { background: red; } i tried <progress style="background: red;"> incorrect effect, progress bar color turns blue red background. guide right direction desired style? thank in advance. here live example: https://jsfiddle.net/z36d3f6l/
Read more

java - Oracle Sql developer error: could not install some modules -

-
i have downloaded fresh copy of sqldeveloper ( sqldeveloper-4.1.3.20.78-no-jre ) oracle website. when unzip , lauch gui, keep getting following error message: warning - not install modules: dynamic module config - no module providing capability org.netbeans.netbinox found. my system: windows 7 32 bit hp probook. jdk 1.6 , 1.7, 1.8 available in java/jdk subdirectory. netbeans 8.0.2 installed finally got way out after dirty hours. extracted sqldeveloper zip in nested directory. i.e: e://a/b/c/sqldeveloper. starting sqldeveloper gui above directory threw erros. solution: go in c:\users**username**\appdata\roaming : delete sql developer , sqldeveloper folders extract sql developer zip in new non nested directory. i.e: e:// start , should work now reference: https://community.oracle.com/thread/3870680?start=0&tstart=0
Read more

How to use autoclose brackets in Jupyter notebook? -

-
this may sound silly question, how make use of autoclose brackets in jupyter notebook? example, when type print( jupyter notebook auto-closes brakets print() and places cursor inside. type argument, say print(1 + 1) now cursor between second 1 , right bracket ) . key navigate right of ) ? of course can press end or → or ) achieve this, not seem save time, purpose of brackets autoclose suppose? thanks in advance.
Read more