Merge development repositories

[katharsis-project]

Merge development repositories

[masterspambot]

From @chb0github on July 26, 2016 1:46

Excellent! Progress.

[masterspambot]

From @ieugen on July 26, 2016 5:46

Awesome!

I saw that none of the previous history is kept. I believe git allows us to merge projects while keeping history. If you agree I will give it a go on a branch and get back with results.

[masterspambot]

From @chb0github on July 27, 2016 5:49

Try it. But it's not the end of the world if you can't

On Mon, Jul 25, 2016, 10:46 PM Ioan Eugen Stan [email protected]
wrote:

Awesome!

I saw that none of the previous history is kept. I believe git allows us
to merge projects while keeping history. If you agree I will give it a go
on a branch and get back with results.

—
You are receiving this because you commented.

Reply to this email directly, view it on GitHub
https://github.com/katharsis-project/katharsis-core/issues/371#issuecomment-235168841,
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABaI0IdJrFp5U3SQuLa7o6sKxLEKFZ1Hks5qZZ8bgaJpZM4JTlB8
.

[masterspambot]

From @meshuga on July 27, 2016 18:27

It would be nice to keep the history, but is it possible to keep even in case of he paths changes?

[masterspambot]

From @meshuga on July 27, 2016 18:43

Ok, I googled that and it turns out it's not so hard. I can do that and apply changes to poms

[masterspambot]

From @ieugen on July 28, 2016 2:22

Great. I will leave it up to you then.

We should strive to migrate to framework this week and block all contributions to the other projects in order to focus on delivering features to framework.

To validate the whole process we should do a new minor release ASAP (next 30 day ?!? ), just to complete the cycle.

Let me know if you think there are things I can help with. If not, after the merge I will focus on merging the changes I worked on.

[masterspambot]

From @meshuga on July 28, 2016 17:54

I think changes you've made have the highest priority and should be merged soon.

OK, take a look at https://github.com/katharsis-project/katharsis-framework. The git commit history is preserved.

[masterspambot]

From @ieugen on July 29, 2016 9:3

OK. I will merge it and do some more work over the weekend.