merge forks please!

[linas]

Instead of forking the repo at https://github.com/renatopp/behavior3editor this repo just dumped code. That's a problem, because history was lost. Oh well. No use crying over split milk. However, this move leaves behind 3 or 4 unmerged forks:

https://github.com/Healthire/behavior3editor
https://github.com/knowrob/behavior3editor
https://github.com/benjycook/behavior3editor

all of which look like they've received significant development work, but are now orphaned. These need to be reviewed and either merged or cherry-picked as appropriate.

--- Want to back this issue? **[Post a bounty on it!](https://www.bountysource.com/issues/27952575-merge-forks-please?utm_campaign=plugin&utm_content=tracker%2F18331319&utm_medium=issues&utm_source=github)** We accept bounties via [Bountysource](https://www.bountysource.com/?utm_campaign=plugin&utm_content=tracker%2F18331319&utm_medium=issues&utm_source=github).

[renatopp]

Hey @linas, could I still do that? If yes, how?

[linas]

Hi .. you are asking me how to merge branches in git? There's a bunch of different ways, but the typical flow is to start with 'master' in your own repo, create a new branch of your master, git pull the other persons repo+branch, resolve conflicts, and commit. If you like the results, you can then merge it into your own master, and push the whole thing to github; (or make a pull request to github of your own branch.)

Recall that git is peer-to-peer which makes it very very different than svn or cvs. Every peer is .. a peer, is equal in status. There is no "priviledged peer", no "master peer". Note that github is just another peer to your own private copy on your local machine: that is why you use push and pull: -- push and pull is how peers talk to each other.

So pseudocode would be something like this:

git checkout master
git pull from https://github.com/behavior3d/behavior3editor  
git checkout -b "sandbox"
git pull from https://github.com/Healthire/behavior3editor
resolve conflicts
git merge
git commit
git push origin sandbox
then on github, create a pull request, review it, merge it there.
after that is done:
git checkout master
git pull from https://github.com/behavior3d/behavior3editor  
git branch -d "sandbox" (delete sandbox, s you don't need it anymore)