Home/ Questions/Q 3406362
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T05:37:07+00:00

I forked rails and then this is what I did. > git clone git@github.com:nadal/rails.git

  • 0

I forked rails and then this is what I did.

> git clone git@github.com:nadal/rails.git
> cd rails
> git remote add upstream git://github.com/rails/rails.git
> git pull upstream master

Now git remote shows two items

> git remote
origin
upstream

I made a bunch of changes to master and comitted it. Then I created a bunch of branches to fix a few rails things. However when I rebase against master I also get changes I did to master.

I want to discard the changes I made to master.

Question:
Since I already committed some changes to my master, how do I reset my master to be exact copy of rails master. I want to discard the committs I made to my master.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team
    $ git checkout master
$ git log  #find version you want, let's say it's 8cdb9
$ git reset --hard 8cdb9     #master is now at version before you made changes
$ git merge myFixBranch1   #assuming myFixBranch1 is a branch that you still want the changes from
$ git pull upstream master    #if you want to update to latest rails code
    • 0