Game Maker not merging

Not sure if this is the right forum to post on or if it should be the Game Maker forums, but might as well find out.

Basically me and my fellow classmates are making a project for Computer Science. We need some sort of versioning software, but Game Maker's built-in source control is crappy, so we made a repository on Bitbucket to combat the problem.

Unfortunately, when I make a change and select the uncommitted changes for pushing to the cloud, it seems not to pick them up. Is this a known problem? Do I need to wait a little while? When I commit things it goes instantly, but if I make changes and commit them, then my friend who was working on the same version has to start over and make the same changes on the new version because they won't merge.

Also, if I need to post this somewhere else, please tell me so I can get an answer from whoever it is faster smile

Thanks

1 answer

1 accepted

1 vote
Accepted answer

You can't push uncommited changes in git.  You should both commit and push your changes.  Before pushing, you should do a pull, which will merge any changes on the server into your local copy of the repo - and which may require you to resolve conflicts if you're working on the same part of the code.  Better yet, you should each work on individual feature branches for each feature you're implementing.  Then you can push to your heart's content without worry about merging, and merge only when you're ready to do so.  However, you should merge early and often.  You might want to read about GitHub Flow as an approach to follow.

 

Thank you very much, I'll get to it right away!

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

436 views 6 9
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you