[Geany-devel] [geanyprj] coding style patch

Matthew Brush mbrush at xxxxx
Tue Dec 13 08:11:28 UTC 2011

On 12/12/2011 11:02 PM, Yura Siamashka wrote:
> Hi
> Sorry I didn't follow conversion to github and I am not really familiar with new workflow.
> So as GeanyPrj maintainer how do I commit patch to mainline? Should my github user be added to "main" geany-plugins repository or I need to create new fork with related changes and create pull request to main geany-plugins from time to time?

I think Frank asked for Github usernames in another thread for this.

> This github stuff is a bit confusing for me.

There was some discussion about doing something like this:

1. Go to github.com/geany/geany-plugins and click "Fork"
2. Go to github.com/you/geany-plugins and get the clone URL
3. From terminal:
   $ git clone <address from github in step 2>
   $ cd geany-plugins/geanyprj
   $ git checkout -b your-topic-branch
   <hack, commit, hack, commit, ...>
4. git push origin your-topic-branch
5. Go to github.com/you/geany-plugins/tree/your-topic-branch and click 
the "Pull Request" button.

Or we might end up just working from the main repository ourselves like 
we did with SVN, unless someone can step up to review all the pull requests.

Frank did you decide on a "best practice" yet?

Matthew Brush

>> On 12/12/2011 06:51 AM, Johann SAUNIER wrote:
>>> Hi there,
>>> This is a new patch for Geanyprj. It doesn't implement any functionality
>>> or bug fix. It's only a cosmetic patch to comply to Geany's coding
>>> conventions.
>>> Since geany-plugins has moved on GitHub, is there an equivalent to the
>>> "tracker->patches" functionality of SourceForge for sending patches ?
>> Yep,
>> In Github land it's called a "pull request".  While logged in to Github,
>> navigate to the geany-plugins repository and click the "fork" button.
>> It will make a copy of the repository under your account.  Create a new
>> branch, hack away and when it's ready, click the "Pull request" button
>> on Github and it will notify committers that you have something ready in
>> your branch to be merged.
>> Of course like you did here on the ML is fine too, but it's easier to
>> loose track of if it's not persistent somewhere.
>> Cheers,
>> Matthew Brush
>> _______________________________________________
>> Geany-devel mailing list
>> Geany-devel at uvena.de
>> https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel

More information about the Devel mailing list