首页 > 解决方案 > git:从远程主机复制文件夹

问题描述

我有 git 分支,想重命名分支中的一个目录并对其进行一些更改,并从 master 到我的分支获取源文件夹的确切副本。如何实现如下所示的所需分支状态?

Remote and local master:

folder1
folder2_v1


Current git branch:

folder1
folder2_v1


Desired state on branch:

folder1
folder2_v2 (renamed the folder2_v1 to v2 with some added additional changes)
folder2_v1 (need to pull exact copy from remote/local master)

标签: git

解决方案


如果你想从你那里得到它而不弄乱你的分支历史并且没有任何承诺只是为了你可以玩它

git mv folder2_v1 folder2_v2 # move the directory as you have it
git checkout origin/master -- folder2_v1 # get the directory as it is in in origin (adjust remote name if required)

那应该做


推荐阅读