Hello, I have been using git but not to an advance level because it's just me who pushes the commit to the github server and so i know any conflicts that arises if any. Now there's another developer working in another part of the world who also pushed some updates to the github repository.
My problem is most of his work are not yet production-ready so I just want to go to my last commit and push my updates there so that when I do a capistrano deploy , I'll be quite sure that the code is production-ready. How can I do this?