[jitsi-dev] [jitsi-commits] master: Merge branch 'master' of https://github.com/jitsi/jitsi (e820f0a)

#1

Hey, Danny

I don't think we have an official policy for this, but we usually try to avoid such merges. One way to do this is to rebase your commits on top of the github master branch before pushing. Another is to work on a local branch, and then merge that into master.

Regards,
Boris

···

On 22/08/14 21:16, danny@dannyvanheumen.nl wrote:

Repository : ssh://lists.jitsi.org/jitsi

On branch : master
Link : https://github.com/jitsi/jitsi/compare/3eeed9cc9eb875a0eea6c91a82817ed02f843f39...e820f0a41dbfaa4f88911f243dd69df86bc15bdc

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

commit e820f0a41dbfaa4f88911f243dd69df86bc15bdc
Merge: 7480912 3eeed9c
Author: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Fri Aug 22 20:09:55 2014 +0200

     Merge branch 'master' of https://github.com/jitsi/jitsi

#2

Hey Boris,

Are you talking specifically about intermediate merges of master into
the (feature) branch I'm working in? Or are you talking about merging
code in general?
In any case, I'll keep it in mind. Thanks for letting me know.

Danny

···

On 08/23/2014 10:46 AM, Boris Grozev wrote:

Hey, Danny

I don't think we have an official policy for this, but we usually try
to avoid such merges. One way to do this is to rebase your commits on
top of the github master branch before pushing. Another is to work on
a local branch, and then merge that into master.

Regards,
Boris

On 22/08/14 21:16, danny@dannyvanheumen.nl wrote:

Repository : ssh://lists.jitsi.org/jitsi

On branch : master
Link :
https://github.com/jitsi/jitsi/compare/3eeed9cc9eb875a0eea6c91a82817ed02f843f39...e820f0a41dbfaa4f88911f243dd69df86bc15bdc

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

commit e820f0a41dbfaa4f88911f243dd69df86bc15bdc
Merge: 7480912 3eeed9c
Author: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Fri Aug 22 20:09:55 2014 +0200

     Merge branch 'master' of https://github.com/jitsi/jitsi

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev

#3

No, not in general -- just about merging master.

Boris

···

On 23/08/14 19:01, Danny van Heumen wrote:

Hey Boris,

Are you talking specifically about intermediate merges of master into
the (feature) branch I'm working in? Or are you talking about merging
code in general?