ios - Git Ignored File When GitIgnore Doesn't Exist -
i have ios project on xcode. i've been working off of branch time. i've made particular changes file , have been committing branch time. when moved old branch, merged code, , deleted recent branch, realized file never updated git. don't have .gitignore
file.
all other files pushed except particular set of header , main objective-c files. have no idea why code never pushed up. i've spent quite bit of time working on , losing updated file great blow me. when moved older commit deleted branch file took original form.
what have caused , there wy me fix this?
update
this not first rodeo git. let me further explain.
every commit i've made i've used git add .
, followed git commit
, git push
respectfully.
i've attempted pull branch remote repository file not reflect of changes i've made of recent commit.
you second question - how code had on file deleted.
here's how -
create new branch -
git checkout -b newbranch
perform reflog , commits -
git reflog | grep commit
now, should list of commits -
d2456b7 head@{1}: commit (merge): merge 354dce1 head@{3}: commit: 4 8c01ff7 head@{6}: commit: 3 1ab4588 head@{7}: commit: 2 3c419d5 head@{8}: commit (initial): 1
find commits want, 3
, 2
above , :
git cherry-pick 1ab4588 git cherry-pick 8c01ff7
do commits , should have branch back.
alternatively, if pushed branch, pull back.
git pull origin branchname
Comments
Post a Comment