将新的 github repo 合并到远程

Question

I am trying to merge commits from branch B to branch A.

branch A has commits a-c 
branch B has commits d-f BUT doesn't have commits a-c in it's commit history.

How can I get branch B's commits df to show in branch A after commit c.

I tried git cherry-pick hashCommit but I got a message saying

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'

I also checked out this SO post , but wasn't sure which Answer was suitable for me.

When I look in my github pages branch B, at the top it say branch B is x commits ahead of branch A

Also after doing the cherry-pick , when I type git log, the first commit shows

commit hashCommitNumber (HEAD -> branchB, origin/branchB, branchA)

I am currently checked out on branch B

Answer 1

What I did was I migrated the RTC histories from the last successful cut off date to the present date

It depends on how/where that migration was made: if it is in a new repo/new branch, then yes, a merge would be difficult (unrelated history)

A better practice is:

• having a local clone of your GitHub repository, set on the branch you want to update with RTC new changesets
• having a local RTC repository workspace (sandbox)
• iterate on each changeset and update your sandbox
• use git --work-tree=/path/to/sandbox add . (done inside your local Git clone). That will detect any new/changed/removed file from sandbox compared to your current Git repository content
• commit, and repeat for the next changeset.