你试图复制所有档案,只是合并,但却没有工作。 这应当奏效,但我认为你可能需要遵循我试图解释的一些不同步骤。
应在<编码>3RDPARTY上打上标签,与贵国出口环境中的检查站相同,这是对的第一次检查。 我将打电话到MERGE_BASE。 从而尝试这些步骤:
- First of all do
git checkout master on REMOTE and make sure it is
up to date with 3RDPARTY with git pull origin.
- In
REMOTE git branch mergeb <MERGE_BASE> <MERGE_BASE> is the
checkin I spoke about in the history that is identical, or as close
as identical, to what you would have in your initial creation of
LOCAL.
- Copy the source for your most up to date version in
LOCAL directly
over top the files in your mergeb branch we just created in
REMOTE. DONOT copy the .git directory!
- In
REMOTE on branch mergeb use git add to make sure all your
changes are applied to the git index and then run git commit. Now
your REMOTE mergeb branch should have identical source to what is
in LOCAL. (you could use git remotes to do this with your LOCAL
changes, but since you don t care about history I recommend just
doing it this way to simplify the process).
- Checkout the master branch again
git checkout master.
- At this point create a new branch that you will use to contribute to
them.. do
git checkout -b remote_work.
- Now, simply merge the
mergeb branch into your remote_work branch
with git merge --no-ff mergeb. At this point you will probably
have all the conflicting merges with their work and your work to
resolve.
一旦你完成这一进程,将工作交给你的部门,你现在就应该处于你想要的准确状态。
After all of this, if you want all your work to appear as if you started with what is currently in 3RDPARTY while on the remote_work branch on REMOTE simply do git rebase master.
从那时起,我将在<代码>REMOTE上与<代码>3RDPARTY合并。 背书并保持您的改动,编号为3RDPARTY,载于remote_work。 或<代码>上其他各处 REMOTE repo.
让我知道,这一进程是否为你服务。
