search

owncloud / smashbox

:collision: main test suite
GNU Affero General Public License v3.0
16 stars 6 forks source link

Adjust to new conflict file scheme of 2.4 client #169

Closed mrow4a closed 6 years ago

mrow4a commented 6 years ago

This should resolve issue https://github.com/cernbox/smashbox/issues/112

@DeepDiver1975 @moscicki

mrow4a commented 6 years ago

shall we merge this one? @DeepDiver1975 @moscicki

moscicki commented 6 years ago

Cool. How do we re-sync your fork with upstream?

On Tue, May 15, 2018 at 11:58 AM, Thomas Müller notifications@github.com wrote:

Merged #169 https://github.com/owncloud/smashbox/pull/169.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/owncloud/smashbox/pull/169#event-1626795044, or mute the thread https://github.com/notifications/unsubscribe-auth/AAl9ja6fA4kRlbUvvP3EcGmlmH0sNE0lks5tyqbegaJpZM4TaqJN .

--

Best regards, Kuba

DeepDiver1975 commented 6 years ago

Cool. How do we re-sync your fork with upstream?

we shall put this on the topic for the next call @felixboehm

mrow4a commented 6 years ago

Well, generally I would need to take cernbox repo, and start adding commit by commit (understanding how it works). And then commit back to cernbox. We diverged a lot and need to check it how we can make it generic and configurable enough.