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

Django REST Framework perform_create: You cannot call `.save()` after accessing `serializer.data` -

-
i have following viewset: class artistprofileviewset(viewsets.modelviewset): queryset = artistprofile.objects.all() serializer_class = artistprofileserializer def perform_create(self, serializer): if serializer.is_valid(): serializer.save() with following serializers: class simpleartisttrackserializer(serializers.hyperlinkedmodelserializer): class meta: model = artisttrack fields = (...my fields...) class artistprofileserializer(serializers.hyperlinkedmodelserializer): owners = userserializer(many=true, required=false) tracks = simpleartisttrackserializer(many=true, required=false) class meta: model = artistprofile fields = (...my fields...) i getting following error: assertionerror: cannot call `.save()` after accessing `serializer.data`.if need access data before committing database inspect 'serializer.validated_data' instead. i don't see editing serializer.data object. th...
Read more

Why does Go error when trying to marshal this JSON? -

-
i'm trying rather simple example of trying decode json file structs using golang. however, when attempting error that json: cannot unmarshal object go value of type []main.track which don't understand. here's code in question, , json can found here . package main import ( "encoding/json" "fmt" "net/http" "os" ) // tracks group of track types type tracks struct { tracks []track } // track represents singular track type track struct { name string url string artist artist } // artist represents single artist type artist struct { name string mbid string url string } func main() { url := "http://ws.audioscrobbler.com/2.0/?method=geo.gettoptracks&api_key=c1572082105bd40d247836b5c1819623&format=json&country=netherlands" response, err := http.get(url) if err != nil { fmt.printf("%s\n", err) os.exit(1) } de...
Read more