Consider the following setup: One Repository1 sits on Bitbucket. A local working copy is situated on my machine. I change files locally, commit and push to Repository1.
Changes in Repository1 (on Bitbucket) (in "master" branch) where made only by me. Now I need to get some of these into a "feature"-branch of another Repository2, which also sits on Bitbucket.
The content of Repository2 however is newer, the changes made there by a remote team are not reflected in Repository1 nor my working copy of it. Repository2 contains also more files, where my Repository1 only contains a small portion of it.
In the end I want to have some of the changes in Repository1 ("master" branch) merged with the newer files in Repository2 ("feature" branch).
However, the only solution I'd know, is unpractial: Sorting out my changed files and manually diff & merge them, then copy them to my local working copy of Repository2, doing a commit & push afterwards.
Is there another method? Preferably something that includes auto-merge, where it's possible.
Thanks in advance!