Include MonoGame GitHub clone in svn/source control?

1

I have a local clone of the MonoGame source via GitHub. I have made some changes to it and would like to compile my game against it.

Is it a good idea to include the MonoGame source in our usual svn project also? Will it cause problems when syncing with both GitHub and svn?
Is it better to get the other project members to connect to my GitHub repository?

2

I chose the latter option, it works.

3

[quote=“monogany, post:2, topic:8031, full:true”]
I chose the latter option, it works.
[/quote]Definitely recommended. Adding the MonoGame source to your SVN repository would have made updating from upstream more difficult later on.

4

Since only one developer is going to maintain the MonoGame source, I was thinking of distributing the dll’s via DropBox to the other pcs, but I won’t try that now.

5

The biggest problem is that sometimes my commits are not visible to the other devs in the GitHub desktop tool. So they cannot check easily if there are changes.

Also, clicking “Update” does not always retrieve my commits. Instead, it is necessary to click on “Sync”. I’m not sure why they are different.

6

I mostly use Git from the command line and from SourceTree when I don’t know what’s going on so I’m not really familiar with GitHub desktop. However Git is Git and what should happen to get your changes to the other devs is:

  • Make changes locally and commit them
  • Push your changes to the remote
  • Have the other guys fetch the updates from the remote and merge it into their local repo (sync if you will)

A quick look at the GitHub Desktop docs got me this:

You must sync your local branch with the remote repository to get any additional commits that have been added to the upstream branch since you originally created your branch.

Sync is probably just a git pull which is equivalent to a git fetch to get the latest version from the remote followed by git merge to merge the remote version into your local repo. This StackOverflow post says the ‘Update from branch’ functionality in GitHub Desktop only does a git merge, meaning it will only work if you have already fetched the data from the remote.

7

OK. This also means that the desktop tool cannot push my changes to the remote where they will be accessible to the other project members, without also merging any changes that have happened to the upstream branch.

8

That’s correct. The desktop tool won’t do any miracles, it just uses simple git commands, so if your branch diverged from the upstream branch you’ll have to fix that first. Or you can push --force if you want to override the remote branch (which is obviously dangerous).