Quote: "Hi everyone, my master is 106 commits behind the GGR master. How do I update my personal master within the Github website? Or is client software required for this?"
Hi Teabone,
both can work, with the client it always work.
If you want to do it over github, do the same merge request as for the game guru repo but in the other direction.
The better way is to pull your repo on your pc(local) and merge the master branch from the GG repo in yours. If a merge conflict appears you can easily fix it with a diff Tool
If nothing works, I can push it in my repo and request a merge from there or setup a merge request in github. What ever you want
(write me a mail, then I see it earlier)
It is a bit complicated at the start but if you get it one time, you will use it for every development. I also use it for lua script, GG development and so on. It is the best way to return your working state to the last moment all works
Edit:
I checked it, github does not allow to automatically merge your stuff. So you must do it on your pc.
How to:
- pull your master branch from your repo on your pc with git
- after this is done => open the pull menu
- in "Pull from" enter "https://github.com/TheGameCreators/GameGuruRepo.git"
- Choose your branch you want to update and choose master as remote branch
- if you have "merge options" choose "merge remote branch in current"
- press pull
it will maybe tell you that you have a merge conflict => edit this conflicts with a tool like kdiff
Ebe Editor Free - Build your own EBE structures with easy and without editing any text files
Thread and Download
