Databases
StackOverflow2013
Postsdbo
PORevert back to a specific commit in git, build, then revert to the latest changes
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PORevert back to a specific commit in git, build, then revert to the latest changes
    text
    copied!<p>There has been some question on reverting back to a commit in git but I wanted to make sure. This SO page is one that helps the most: <a href="https://stackoverflow.com/questions/4114095/git-revert-to-previous-commit-how">How to revert Git repository to a previous commit?</a></p> <p>I have a previous commit, say 1.0 for a customer and it is complete. I commit (not sure if I push) and then create a new branch to work on the next version. Now, for some reason, the binary for 1.0 is "corrupted" and I need to go back but also keep the current modifications.</p> <p>git log reveals this:</p> <pre><code>commit be01d2a99ec35bbfcdbca47d5570acef8c69b275 Author: Yko &lt;xxxxxxxxx@gmail.com&gt; Date: Mon Apr 25 10:25:35 2011 -0400 </code></pre> <p>So, the steps I need to take is this?</p> <pre><code>1. git add . 2. git commit "good stopping point for v1.1" 3. git checkout be01... </code></pre> <p>I am assuming step #3 modifies all the source code? This is an XCode project (iPhone app) so I just have to reload the project file, build, and have the new binary .app?</p> <p>Then, goes back to the latest version 1.1 with</p> <pre><code>git checkout "latest commit #"? </code></pre> <p>Thanks,</p> <p>I'm new and don't want to lose any work. Appreciate the help!!!</p> <p>EDIT: Based on a few answers, I want to clarify. 1. I do not want to merge any branches. I want to go back to version 1.0 and rebuild the source to create a new binary then hop back to where I was. Suppose verision 1.0 have apples to be $1.00 and version 1.10 have apples to be $1.10. I want to go back to version 1.0, rebuild the source code where apples are $1.00, give the binary to customer x. Then, hop back to version 1.10, keep working on it.</p> <p>Thanks again!!!</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload