Merge edge and master

Jeremy O'Connor

unread,

Oct 17, 2013, 5:17:23 AM10/17/13

to chisim...@googlegroups.com

Hi monwabisi

Could you please merge edge with master?

--
Jeremy

Monwabisi sifumba

unread,

Oct 17, 2013, 5:43:59 AM10/17/13

to chisim...@googlegroups.com

There are a lot of broken things in the forum module dude, I don't think merging the two is a good Idea. How about we add another branch?

regards

monwabisi

--

---
You received this message because you are subscribed to the Google Groups "chisimba-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to chisimba-dev...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Derek Keats

unread,

Oct 17, 2013, 5:47:42 AM10/17/13

to chisim...@googlegroups.com

I don't think anybody is using Forum from Git. But this is the big problem with merging everything into one big repo I think. I am wondering if it would not be better to have Chisimba, Chisimba-modules, and Chisimba-canvases as separate repositories.

--
Dr Derek W. Keats, PhD
IT Strategy, FOSS, Technology Innovation

Kenga Solutions Pty Ltd
2 Hollywood Drive, Northcliff, Johannesburg
Email: de...@dkeats.com
Phone: +27 82 787 0169 / +27 11 477 4954
Web: http://www.dkeats.com

James Scoble

unread,

Oct 17, 2013, 5:56:43 AM10/17/13

to chisim...@googlegroups.com

Is it possible to merge only the section that Jeremy has been working on?

From:	Monwabisi sifumba <wsif...@gmail.com>
To:	<chisim...@googlegroups.com>
Date:	10/17/2013 11:55 AM
Subject:	Re: [Chisimba-dev] Merge edge and master

Jeremy O'Connor

unread,

Oct 17, 2013, 6:09:26 AM10/17/13

to chisim...@googlegroups.com

Master and edge are the two main branches of Chisimba. We need to be able to always merge edge into master.
Do you foresee the issues with the forum module being resolved at some stage? Otherwise, could you perhaps restore the forum module to a working version in edge, create a development branch for that module and continue development there, and then merge edge into master?

--Jeremy

Monwabisi sifumba

unread,

Oct 17, 2013, 6:13:18 AM10/17/13

to chisim...@googlegroups.com

@James Scoble, I do not think that is possible, that is why I propose a new branch which will be a copy of master then I can merge Jeremy's work into it.

@Derek Deats, that is a great idea but adding two more repos will need some money.

monwabisi

Derek Keats

unread,

Oct 17, 2013, 7:07:19 AM10/17/13

to chisim...@googlegroups.com

Why money?

Monwabisi sifumba

unread,

Oct 17, 2013, 7:13:23 AM10/17/13

to chisim...@googlegroups.com

I sent an eMail to Prince Mbekwa and I quoted his reply, I thought I had to pay if I wanted to create another repository (Made that assumption based on my experience since creating private repositories for the company I work for). I will create the repos as soon as I get permission to fork.

monwabisi

Derek Keats

unread,

Oct 17, 2013, 7:30:24 AM10/17/13

to chisim...@googlegroups.com

what does that mean? Permission to fork? Can't you just svn update them, remove the svn dirs and create a new project?

Derek Keats

unread,

Oct 17, 2013, 7:31:16 AM10/17/13

to chisim...@googlegroups.com

Wait. You need to import the way prince did it in order to retain the history. We can't lose the history. That is important.

Monwabisi sifumba

unread,

Oct 17, 2013, 7:36:27 AM10/17/13

to chisim...@googlegroups.com

GITHUB says, "You don't have permission to create repositories for this organization.Sorry about that"

James Scoble

unread,

Oct 17, 2013, 7:43:24 AM10/17/13

to chisim...@googlegroups.com

Which user does? There should be more than one.

From:	Monwabisi sifumba <wsif...@gmail.com>
To:	<chisim...@googlegroups.com>

Date:

10/17/2013 1:37 PM

Monwabisi sifumba

unread,

Oct 17, 2013, 7:46:49 AM10/17/13

to chisim...@googlegroups.com

Selection_003.png

Derek Keats

unread,

Oct 17, 2013, 7:47:44 AM10/17/13

to chisim...@googlegroups.com

I think ask prince to give you permissions.

d

Reply all

Reply to author

Forward