git - 如何将我的应用程序切换为使用来自不同远程源的代码（不仅仅是 URL 更改，具有不同的 git 历史记录）

Question

I had some intractable git-history related issues in my current (Rails) code repo, whose remote origin on Github is "V1.git"

Thanks to help in another SO thread, I made an all-new repo with the issues fixed, and pushed the master branch of the new (fixed) repo to a new Github repo named "V2.git". FWIW, the files at the "HEAD" of both V1 and V2 are the same, but, if it matters, the most recent commit IDs are not the same and V2 also has a lot more git history.

How can I force-overwrite V2 from Github to my development folder MYAPP, while leaving all untracked files alone?

I'm guessing I probably:

• in MYAPP, delete the current remote "origin" (points to V1)
• and also probably delete the .git folder,
• then simply clone V2 into the existing MYAPP folder where it will leave untracked file alone?

Or perhaps should I:

• in MYAPP, delete the current remote "origin" (points to V1)
• and delete the .git folder
• then add the new remote "origin" (points to V2)
• then do git init
• then something like git pull origin master ?

Or perhaps it is as simple as adding "origin" to point to V2, then doing some sort of forced git-pull?

Answer 1

The step delete the .git folder seems unnecessary.

But you'll probably want to backup your entire MYAPP folder first , as better safe than sorry.

Then, a straightforward procedure would be:

git checkout master

git remote remove origin

git remote add origin git@github.com:YourLogin/V2.git  # with the proper URL

git fetch origin

git reset --soft origin/master
# ↑ may suffice for your use case

# OR git reset --hard origin/master
# ↑ risk: overwriting unsaved changes or files untracked in V1 but tracked in V2

git branch -u origin/master
# ↑ optional: allows one to use `git push` and `git pull` without any argument

Then inspect the new repository state, with git status or gitk .