Git - merge non-git changes -

Git - merge non-git changes -

i've got remote code-base in tfs , maintaining changes locally in git. have 2 git repositories, working tree , backup tree. i've been making changes working tree , merging them backup tree. need merge changes tfs git repository , i'm stuck trying figure out how merge correctly. i've got this:

tfs-----------------+--+--+--+--+--+--+--+--+--+--> \ \ git working ---+--+--+--+--+--+--+--+--+----> \ \ \ \ git backup ----------------------------- ? (+ = commit, \ = merge)

so have 2 git repositories containing changes i've made locally. i've got latest version tfs has overwritten local changes in working tree, i've not yet committed git repository.

so think want commit tfs changes working tree , merge backup tree though separate branch? or improve of branching initial git version, adding tfs changes , merging 2 branches?

any suggestions on how appreciated.

git merge git-merge