git fork merge

classic Classic list List threaded Threaded
5 messages Options
hou
Reply | Threaded
Open this post in threaded view
|

git fork merge

hou
Hello,

could anybody please merge my github fork containig Slovak translation updates for GRAMPS? http://sourceforge.net/u/ondrisko/gramps/ci/master/tree/
It's been 3 months since I last requested a merge. http://sourceforge.net/p/gramps/source/merge-requests/
Or alternatively, is it possible to obtain commit rights, so I don't have to bother you with this?

Thanks,

Ondrej

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: git fork merge

Paul Kilgo
This is slightly unrelated, but SourceForge apparently still has
issues with their merge requests. They look almost totally broken to
me, though maybe someone knows better.

https://forge-allura.apache.org/p/allura/tickets/5993/

I'm not sure if merge requests on SF are still the preferred way for
the community to contribute but maybe someone can comment.

On Sun, Nov 2, 2014 at 11:49 AM,  <[hidden email]> wrote:

> Hello,
>
> could anybody please merge my github fork containig Slovak translation updates for GRAMPS? http://sourceforge.net/u/ondrisko/gramps/ci/master/tree/
> It's been 3 months since I last requested a merge. http://sourceforge.net/p/gramps/source/merge-requests/
> Or alternatively, is it possible to obtain commit rights, so I don't have to bother you with this?
>
> Thanks,
>
> Ondrej
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel



--
Paul Kilgo
[hidden email]

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: git fork merge

Nick Hall
In reply to this post by hou
On 02/11/14 16:49, [hidden email] wrote:
> could anybody please merge my github fork containig Slovak translation updates for GRAMPS?http://sourceforge.net/u/ondrisko/gramps/ci/master/tree/
> It's been 3 months since I last requested a merge.http://sourceforge.net/p/gramps/source/merge-requests/
> Or alternatively, is it possible to obtain commit rights, so I don't have to bother you with this?
>

Are you the main Slovak translator?  I could give you permission to push
your changes, but it isn't really my decision to make.

I get a conflict if I try to rebase your ondrisko/master branch onto the
current master.  Perhaps a patch file would be easier.

Nick.


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: git fork merge

Nick Hall
In reply to this post by Paul Kilgo
On 05/11/14 22:37, Paul Kilgo wrote:
> This is slightly unrelated, but SourceForge apparently still has
> issues with their merge requests. They look almost totally broken to
> me, though maybe someone knows better.
>
> https://forge-allura.apache.org/p/allura/tickets/5993/
>
> I'm not sure if merge requests on SF are still the preferred way for
> the community to contribute but maybe someone can comment.

Merge requests on SF are possible, but the user interface isn't very
nice.  I always pull changes down locally to look at them.  My own
personal preference is a patch attached to a bug report or feature request.

Any changes relating to Gramps Connect need to be referred to Doug
Blank.  I suggest that you send him a reminder.

Nick.


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: git fork merge

DS Blank
On Wed, Nov 5, 2014 at 6:41 PM, Nick Hall <[hidden email]> wrote:
On 05/11/14 22:37, Paul Kilgo wrote:
> This is slightly unrelated, but SourceForge apparently still has
> issues with their merge requests. They look almost totally broken to
> me, though maybe someone knows better.
>
> https://forge-allura.apache.org/p/allura/tickets/5993/
>
> I'm not sure if merge requests on SF are still the preferred way for
> the community to contribute but maybe someone can comment.

Merge requests on SF are possible, but the user interface isn't very
nice.  I always pull changes down locally to look at them.  My own
personal preference is a patch attached to a bug report or feature request.

Any changes relating to Gramps Connect need to be referred to Doug
Blank.  I suggest that you send him a reminder.

Received! I hadn't seen that. I'll see if I can figure out SF's merge requests.

-Doug
 

Nick.


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel


------------------------------------------------------------------------------

_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel