Closed BartlomiejSkwira closed 10 years ago
Hi!
Can you rebase your commits together, and rebase the whole lot against master so this pull request applies cleanly?
Thanks
Jason
Hey Actually there are no tests for these features :( I'll get back to rebase after I write at least some basic tests
Any update on this? Seems like a useful addition.
OK, I think I have fraked up my repo, I was trying to rebase/squash the commits and I accidentally deleted some :cry: ..... my noobishness (I was squashing for the 1st time) had backfired. Wonder If I can get them back
git reflog is your friend. You can rewind to almost any point in your git history. On Nov 18, 2013 9:03 AM, "BartlomiejSkwira" notifications@github.com wrote:
OK, I think I have fraked up my repo, I was trying rebase/squash the commits accidentally deleted some [image: :cry:] ..... my noobishness (I was squashing for the 1st time) had backfired. Wonder If I can get them back
— Reply to this email directly or view it on GitHubhttps://github.com/beyondthestory/rails_admin_map_field/pull/7#issuecomment-28699643 .
Ok, so this branch https://github.com/BartlomiejSkwira/rails_admin_map_field/tree/pull_request_branch seems to have all of the stuff. Now what should I do: git rebase -i HEAD~26 #the number of commits that are in this pull request
Correct?
Checkout the section "Feature Development" at http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html for info on proper squashing/rebasing of feature branches.