Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
Joomla! General Development
Home
About this group
Apply for group membership
Joomla and Git, github
Options
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
   14 messages - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Antanas Vipartas  
View profile   Translate to Translated (View Original)
 More options Aug 17 2012, 2:54 am
From: Antanas Vipartas <vipanto...@gmail.com>
Date: Thu, 16 Aug 2012 23:54:30 -0700 (PDT)
Local: Fri, Aug 17 2012 2:54 am
Subject: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Hello. I forked joomla-cms <https://github.com/joomla/joomla-cms>, and
later wanted to contribute to Joomla3-admin-template<https://github.com/Joomla3-Admin-template/joomla-cms>,
which is also a fork from realityking/joomla-cms. Unfortunatelly, I cannot
make one more fork of Joomla3-admin-template in order to do pull requests.

What is the best practice to contribute there? Since I cannot use pull
requests and cannot push directly to the repository. Thanks


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Nikolai Plath  
View profile   Translate to Translated (View Original)
 More options Aug 17 2012, 3:16 am
From: Nikolai Plath <der.el.k...@gmail.com>
Date: Fri, 17 Aug 2012 02:16:15 -0500
Local: Fri, Aug 17 2012 3:16 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Hi,
you can only have one fork. What you want is called a "branch". You may
have as much as you like of those thingies, so you may also have more
than one pull request open ;)

see: http://learn.github.com/p/branching.html

Regards,
Nikolai

Am 17.08.2012 01:54, schrieb Antanas Vipartas:


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
JM Simonet  
View profile  
 More options Aug 17 2012, 3:33 am
From: JM Simonet <infograf...@gmail.com>
Date: Fri, 17 Aug 2012 09:33:30 +0200
Local: Fri, Aug 17 2012 3:33 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Joomla 3.0 alpha2 is now merged in trunk/master and released
http://www.joomla.org/announcements/release-news/5459-joomla-3-0-alph...

Please make pulls towards master and post in the normal joomla
tracker on joomlacode:
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBr...

Thanks

JM

At 2:16 -0500 17/08/12, Nikolai Plath wrote:

--
>Please keep the Subject wording in your answers

This e-mail and any attachments may be confidential. You must not
disclose or use the information contained in this e-mail if you are
not the
intended recipient. If you have received this e-mail in error, please
notify us immediately and delete the e-mail and all copies.
-----------------------------------------------------------
Jean-Marie Simonet  /  infograf768
Joomla Production Working group
Joomla! Translation Coordination Team

 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Antanas Vipartas  
View profile  
 More options Aug 17 2012, 6:48 am
From: Antanas Vipartas <vipanto...@gmail.com>
Date: Fri, 17 Aug 2012 13:48:12 +0300
Local: Fri, Aug 17 2012 6:48 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Thanks for the response. You mean I should create a branch, commit to it,
and then inform the "Joomla3-admin-template" user to add me as a remote and
checkout my branch?

I guess I cannot create pull requests to non-parent (in this case
joomla/joomla-cms), forked repository?

On Fri, Aug 17, 2012 at 10:16 AM, Nikolai Plath <der.el.k...@gmail.com>wrote:


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Michael Babker  
View profile  
 More options Aug 17 2012, 6:52 am
From: Michael Babker <mbab...@flbab.com>
Date: Fri, 17 Aug 2012 05:52:16 -0500
Local: Fri, Aug 17 2012 6:52 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

You can create pull requests for any fork of the base joomla/joomla-cms repo
(the GitHub GUI lets you set all this when you issue the pull request).  You
can only fork one repo though in that tree.  So, if you already forked
joomla/joomla-cms and were collaborating with me on a feature I'm working
on, instead of also forking mbabker/joomla-cms, you would just add my
repository as a remote in your local environment, checkout the branch that
is being worked on, make your commits, push to GitHub, and open the pull
request.  I hope that makes some bit of sense.

From:  Antanas Vipartas <vipanto...@gmail.com>
Reply-To:  <joomla-dev-general@googlegroups.com>
Date:  Friday, August 17, 2012 5:48 AM
To:  <joomla-dev-general@googlegroups.com>
Subject:  Re: [jgen] Joomla and Git, github

Thanks for the response. You mean I should create a branch, commit to it,
and then inform the "Joomla3-admin-template" user to add me as a remote and
checkout my branch?

I guess I cannot create pull requests to non-parent (in this case
joomla/joomla-cms), forked repository?

On Fri, Aug 17, 2012 at 10:16 AM, Nikolai Plath <der.el.k...@gmail.com>
wrote:

>  Hi,
>  you can only have one fork. What you want is called a "branch". You may have
> as much as you like of those thingies, so you may also have more than one pull
> request open ;)

--
You received this message because you are subscribed to the Google Groups
"Joomla! General Development" group.
To post to this group, send an email to joomla-dev-general@googlegroups.com.
To unsubscribe from this group, send email to
joomla-dev-general+unsubscribe@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/joomla-dev-general?hl=en-GB.

 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Antanas Vipartas  
View profile  
 More options Aug 17 2012, 8:11 am
From: Antanas Vipartas <vipanto...@gmail.com>
Date: Fri, 17 Aug 2012 15:11:31 +0300
Local: Fri, Aug 17 2012 8:11 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Thanks, it makes sense.

So let's say I have "test" branch, forked from "joomla/joomla-cms", which
is in sync with upstream, I just merged it.
And You "mbabker/joomla-cms" have a branch named "contribute-here", but it
is several commits BEHIND the main joomla-cms upstream.
I want exact copy of your branch in order to fix some files. But if I make:

git branch test
git checkout test
git remote add mbabker https://github.com/mbabker/joomla-cms.git
git fetch mbabker
git merge mbabker/contribute-here

I get many conflicts and have to resolve them manually. What am I missing
in order to have exact copy of your branch and help fix ONE single file
instead of doing huge merge?


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Mark Dexter  
View profile  
 More options Aug 17 2012, 11:16 am
From: Mark Dexter <dextercow...@gmail.com>
Date: Fri, 17 Aug 2012 08:16:27 -0700
Local: Fri, Aug 17 2012 11:16 am
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author
We really need a step-by-step tutorial for this in the wiki. Something
similar to http://docs.joomla.org/Git_for_Testers_and_Trackers except
that explains how to create a pull request for either the cms, the
platform, or any arbitrary branch. If someone could volunteer to start
with a rough draft, others will help polish and improve it. Thanks!
Mark


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Joe Palmer  
View profile  
 More options Aug 17 2012, 12:44 pm
From: Joe Palmer <plantoni...@gmail.com>
Date: Fri, 17 Aug 2012 17:44:17 +0100
Local: Fri, Aug 17 2012 12:44 pm
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

+1 that would be really helpful!
On Aug 17, 2012 4:16 PM, "Mark Dexter" <dextercow...@gmail.com> wrote:


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
allon moritz  
View profile   Translate to Translated (View Original)
 More options Aug 17 2012, 2:24 pm
From: allon moritz <allon.mor...@gmail.com>
Date: Fri, 17 Aug 2012 20:24:10 +0200
Local: Fri, Aug 17 2012 2:24 pm
Subject: Re: [jgen] Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

+1 from me as well...I'm sure more pull requests will find the way into
joomla.


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
El KuKu  
View profile  
 More options Aug 17 2012, 10:58 pm
From: El KuKu <der.el.k...@gmail.com>
Date: Fri, 17 Aug 2012 19:58:13 -0700 (PDT)
Local: Fri, Aug 17 2012 10:58 pm
Subject: Re: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Matt Thomas  
View profile   Translate to Translated (View Original)
 More options Aug 17 2012, 11:00 pm
From: Matt Thomas <m...@betweenbrain.com>
Date: Fri, 17 Aug 2012 23:00:28 -0400
Local: Fri, Aug 17 2012 11:00 pm
Subject: Re: [jgen] Re: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Has anyone looked at https://help.github.com/articles/fork-a-repo for Git
related hints?

Best,

Matt Thomas
Founder betweenbrain <http://betweenbrain.com/>™
Lead Developer Construct Template Development
Framework<http://construct-framework.com/>
Phone: 203.632.9322
Twitter: @betweenbrain
Github: https://github.com/betweenbrain


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Antanas Vipartas  
View profile  
 More options Aug 20 2012, 6:04 am
From: Antanas Vipartas <vipanto...@gmail.com>
Date: Mon, 20 Aug 2012 13:04:31 +0300
Local: Mon, Aug 20 2012 6:04 am
Subject: Re: [jgen] Re: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

Thanks. I read those before, but non of them speaks about how to do a pull
request for the already forked joomla-cms repository... In this case:
joomla-cms/Joomla3-Admin-template...

--
sincerely,
Antanas Vipartas

  members.png
100K Download

 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
elin  
View profile   Translate to Translated (View Original)
 More options Aug 20 2012, 11:32 am
From: elin <elin.war...@gmail.com>
Date: Mon, 20 Aug 2012 08:32:13 -0700 (PDT)
Local: Mon, Aug 20 2012 11:32 am
Subject: Re: [jgen] Re: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

When you make a pull request the default place to send it is to joomla
master, but that is actually a drop down and you can pick any fork and it
will then let you pick any branch in the fork you selected.

Elin


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Andrea Tarr at Tarr Consulting  
View profile  
 More options Aug 21 2012, 8:09 pm
From: Andrea Tarr at Tarr Consulting <at...@tarrconsulting.com>
Date: Tue, 21 Aug 2012 20:09:11 -0400
Local: Tues, Aug 21 2012 8:09 pm
Subject: Re: [jgen] Re: Joomla and Git, github
Print | Individual message | Show original | Report this message | Find messages by this author

This was posted by Sam Moffatt in the JBS google list and these are the notes I keep going back to:

You can't fork in the sense of through the GitHub UI when you've
already got a repository with the same name however you can create a
branch through the process listed below. I prefer this method because
it ensures that I'll always create a new branch based on the remote
version cleanly without having to update my own copy of the branch
that I might want to clone from first.

Presuming you've cloned from your own repository:

git clone <your git url> <destination>

You can add a remote for the person you want to fork from (I usually
use github username for <remotename>):

git remote add <remotename> <git url from their repo page>

You then do a fetch to get all refs to grab the new branches:

git fetch --all

And then you can fork from their branch:

git checkout -b <branchname> <remotename/remotebranch>

And that will create a new branch in your local repository based off
their branch (pull requests back to that branch from your branch will
be have in github).

You then need to push that to your repository:

git push origin <branchname>

And finally reconfigure your local branch to point to the branch you
just created on GitHub:

git branch --set-upstream <branchname> origin/<branchname>

At this point git push will default to your repository not
<remotename>'s repository.

It's a few commands to get around, but once you've done it a few times
it ends up in muscle memory. I've found this ends up working out
neater in the GitHub UI as well.

Sam Moffatt
http://pasamio.id.au

Andrea Tarr

Tarr Consulting
www.tarrconsulting.com

On Aug 20, 2012, at 6:04 AM, Antanas Vipartas wrote:


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »

Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
©2013 Google