The International Simutrans Forum

 

Author Topic: Github repository - merging  (Read 1786 times)

0 Members and 1 Guest are viewing this topic.

Offline Milko

  • Devotee
  • *
  • Posts: 829
Github repository - merging
« on: May 09, 2012, 08:41:13 AM »
Hello The Hood

I am registered to GitHub. For now, I understood very little ....
What I wonder is: if I insert a fork in github and changes to pak128Brit, you will be able to merge or you are using another portal / software?

Edit:
Can anyone tell me how can I delete a commit that I put in github? (see attached picture).


Giuseppe
« Last Edit: May 09, 2012, 10:16:45 PM by Milko »

Offline Dwachs

  • DevTeam, Coder/patcher
  • Administrator
  • *
  • Posts: 4601
  • Languages: EN, DE, AT
Re: Github repository - merging
« Reply #1 on: May 13, 2012, 12:17:36 PM »
Can anyone tell me how can I delete a commit that I put in github? (see attached picture).
I am not a git power-user, but here is, what I did in a similar situation: (There might be better methods to achieve the goal ...)

First you do this on your computer:
(1) create branch named master2 at the next-to-last commit
(2) delete branch master (locally at your machine)
(3) rename master2 to master
If this worked, you need to push to github
(4) delete master branch at github
(5) push (local) master branch to github

Offline The Hood

  • Moderator
  • *
  • Posts: 2889
  • pak128.Britain developer
Re: Github repository - merging
« Reply #2 on: May 14, 2012, 09:34:14 PM »
Afraid I know very little about Git - just did enough to dump the blend files there for other people's access...

Offline Milko

  • Devotee
  • *
  • Posts: 829
Re: Github repository - merging
« Reply #3 on: May 15, 2012, 08:07:22 AM »
Hello

@ The Hood

I was looking for a way to publish amendments to the pak so that was easy for you to enter it. In fact I made a repository connected to pakbritain standards. I had noticed that all the others were related to the experimental version, not the standard. I think I understand that you are not required that I publish on github changes as it would be useful to James.  I think to change the repository to facilitate joining the experimental version of James directly using github. Well ... how do I communicate to you the changes?

Giuseppe

Offline Milko

  • Devotee
  • *
  • Posts: 829
Re: Github repository - merging
« Reply #4 on: May 21, 2012, 09:29:27 AM »
@Dwachs

Thanks, after some testing I did.

Giuseppe