Textpattern on GitHub

philwareham · 2012-03-20 16:36:13

Cheers Julián, I was going to erase my Textpattern fork and start again properly from scratch once the master (official) one was synced – but I’ll try your suggestions out for now, always eager to learn new stuff.

maniqui · 2012-03-20 16:44:17

^^ :)

Also, I (wrongly) thought GH had some button to “sync back this fork with upstream (original) repo”, but no, it seems not.
So, the way to keep your master branch in sync with the upstream master branch is by adding the original repo as a remote and doing some simple fetch/merge/push dance.
More about that here: help.github.com/fork-a-repo/

philwareham · 2012-03-20 18:24:02

OK Julián, I think I get this?

I fork the official master, then make my master use upstream master as its source.

I can then keep my master in sync with the official master using git fetch upstream

Then I do all my work in a branch (or branches) of my master, and when I want to do a pull request I do it directly from my branch back to the upstream master (i.e. I don’t merge my branch into my master first)?

Last edited by philwareham (2012-03-20 18:24:53)

maniqui · 2012-03-22 02:42:32

Truth be told, it’s really up to you what you want to do with the master branch, now that you have your very own fork. :)
You could do all your experimental work directly in the master branch of your fork, and each time the upstream master is updated, you could fetch those changes and rebase your master on top of those changes.

I understand that GH lets you do Pull Requests from any of your branches, and then, it let the other party to pick where to pull them.
So, yes, you won’t have to merge them back to your master branch.

Finally, and more important, you could be sure that the changes you do in your branches will apply cleanly to upstream master by rebasing those branches with upstream master (or your master, assuming you keep it “pure”, to match upstream).

philwareham · 2012-03-22 07:09:31

Thanks for the tips Julián, very helpful. I’ve tried out a system that works for me now (keep my master clean and work in branches, pull request direct from branch to the upstream master).

Gocom · 2012-04-01 17:14:35

How is it going? Any news about the script? Has there been any progress? Properly synched git repo would be amazing.

philwareham · 2012-04-03 12:15:32

Hey devs, maybe you could ask Julián or Jukka to help set this up for you? We are itching to have a synced Github repo for our own experiments and to provide juicy new patches/commits for your consideration.

Bloke · 2012-04-03 12:22:37

philwareham wrote:

Hey devs, maybe you could ask Julián or Jukka to help set this up for you?

Graeme offered to keep it running, I just haven’t got back to him yet, sorry.

philwareham · 2012-04-04 08:36:16

When this repo finally up and running again, people might find this guide useful…

How to GitHub: Fork, Branch, Track, Squash and Pull Request

philwareham · 2012-04-17 14:13:35

Still no joy on this? :(

wet · 2012-04-17 15:09:57

Enjoy. Fresh every 30 minutes as long as I feed the server’s hamster.

philwareham · 2012-04-17 15:25:32

Great thanks. I’m forking happy now.

Textpattern CMS

Textpattern CMS support forum

#16 2012-03-20 16:36:13

Re: Textpattern on GitHub

#17 2012-03-20 16:44:17

Re: Textpattern on GitHub

#18 2012-03-20 18:24:02

Re: Textpattern on GitHub

#19 2012-03-22 02:42:32

Re: Textpattern on GitHub

#20 2012-03-22 07:09:31

Re: Textpattern on GitHub

#21 2012-04-01 17:14:35

Re: Textpattern on GitHub

#22 2012-04-03 12:15:32

Re: Textpattern on GitHub

#23 2012-04-03 12:22:37

Re: Textpattern on GitHub

#24 2012-04-04 08:36:16

Re: Textpattern on GitHub

#25 2012-04-17 14:13:35

Re: Textpattern on GitHub

#26 2012-04-17 15:09:57

Re: Textpattern on GitHub

#27 2012-04-17 15:25:32

Re: Textpattern on GitHub

Board footer