How to go about collaboration with git on a single repo locally stored

[EDIT: Question modified based on initial feedback]

I have a local git repo on my pc, to which I've been committing my own changes, I've been working on a single master branch.

Now, I need to let in another dev and I'm going to use the "bundle" method to collaborate in an "offline" fashion (see: Workflow and setup of a bare git repository for transferring project/changes/commits to offline repository on a seperate machine?).

So, I created a bundle like this:

cd myrepo
git bundle create repo.bundle HEAD master


and gave it to the developer. He, in turn, created the repo with and created his own branch master-other:

git clone repo.bundle newrepo
git branch master-other
git checkout master-other


He did some modifications and committed them.
Now, say I want to import his mods back to me. The following command works fine:

git bundle create new_commits.bundle master-other ^ffffff


Now I am unsure what I want on the first machine which created the original bundle.

Do I want to import his changes with:

git pull new_commits.bundle master-other


This command creates a situation like this:

* aaaaaaa (HEAD -> master) Merge branch 'master-other' of new_commits.bundle
|
| * bbbbbbb commit by other person 2
| * ccccccc commit by other person 1
* | ddddddd a commit I made after doing the bundle
|/
* ffffff my last commit


Or do I want to create another branch called master-other and import his commits there and then merge back to my master branch?

Or something else?

The objective is to keep a working repo on my side, as well as giving back to the other developer my changes too.

Thanks a lot!

git diff

git format-patch

git am

2 Answers
2

Or do I want to create another branch called master-other and import his commits there and then merge back to my master branch?

Actually, the git pull you just did already created a branch (albeit unnamed), and merged it to master, as your diagram illustrates.

git pull

If you want to import those commits directly on top of your current branch, do:

git pull --rebase new_commits.bundle master


The objective is to keep a working repo on my side

, as well as giving back to the other developer my changes too.

Simply make a new incremental bundle and repeat the process.

Is there a reason why you wouldn't use a privately published repository for this? Just curious. Seems like since you have been working alone and you want to bring in another collaborator, using a published repo would serve many purposes. I'm not flat-out advocating Github since there are other services like BitBucket and GitLab.

You each could have a fork of the project and submit pull requests for changes. Also, you'd beef up your redundancy by having 4 copies of the code (individual copies and 2 forks) instead of 2.

You both could largely work in isolation but come together with PRs as needed.

Thanks for contributing an answer to Stack Overflow!

But avoid …

To learn more, see our tips on writing great answers.

Some of your past answers have not been well-received, and you're in danger of being blocked from answering.

Please pay close attention to the following guidance:

But avoid …

To learn more, see our tips on writing great answers.

Required, but never shown

Required, but never shown

By clicking "Post Your Answer", you acknowledge that you have read our updated terms of service, privacy policy and cookie policy, and that your continued use of the website is subject to these policies.