Re: Nsesa Bungeni Merge

Ashok Hariharan

unread,

Mar 13, 2013, 8:15:03 AM3/13/13

to bungen...@googlegroups.com

We are too many revisions behind to successfully merge.

The code that we write should be completely independent of the package structure we have forked from, that way we can avoid such merge conflicts ...

so I would suggest you take your work and put it in a package structure ... org.bungeni.at4am ...followed by the standard package structure adopted by them . that way we can still have there packages to compare side by side with ours and still keep our work separate.

committing now ...

On 13 March 2013 13:53, sam weru <sam...@gmail.com> wrote:

Good day,

There is an error in modification of amendments i.e after reloading the bill. I've checked on nsesa-editor-an on bitbucket and there are changes concerning the same issue. Please merge with nsesa-editor-bungeni with nsesa-editor-an.

Thanks.

Best Regards,
Samuel Weru.

--
Have A Nice Day!!!

Ashok Hariharan

unread,

Mar 14, 2013, 4:09:21 AM3/14/13

to bungen...@googlegroups.com

OK -- let me know when the migration has been done

Ashok

On 14 March 2013 08:47, sam weru <sam...@gmail.com> wrote:

Good day,

The refactoring of the editor is causing some errors due to introduction of the new namspace. I am trying to create a new gwt module so as to transfer the classes that are needed and also all servlets, this is because the new module will contain the entry point.

Will get back to you when am done.

Best Regards,
Samuel Weru.

sam weru

unread,

Mar 14, 2013, 9:15:13 AM3/14/13

to bungen...@googlegroups.com

I've done a commit to bungeni-at4am but the underlying issue of modifying an amendments still persists - working on that one. There no conflicts so far, we can easily merge now.

Sam.

--
You received this message because you are subscribed to the Google Groups "bungeni-exist" group.
To unsubscribe from this group and stop receiving emails from it, send an email to bungeni-exis...@googlegroups.com.
To post to this group, send email to bungen...@googlegroups.com.
Visit this group at http://groups.google.com/group/bungeni-exist?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.

Ashok Hariharan

unread,

Mar 14, 2013, 9:16:34 AM3/14/13

to bungen...@googlegroups.com

Cool thanks let me test and revert

Ashok

Reply all

Reply to author

Forward