Re: [flux-dev] Flux sync vs. (Eclipse) Team sync?

[Kris De Volder <kdevolder@xxxxxxxxxx>]

There's really no problem if you consider two flux 'workspaces' that are synched to one another as really just one workspace shared through flux.

As the idea is that the two workspaces are always kept in synch it won't create merge conflicts with git. If you push from one workspace to git, the
fact that you have pushed to git should almost instantly be reflected also in the other workspace state.

Kris

On Mon, Nov 10, 2014 at 7:10 AM, Pohl, Christoph <christoph.pohl@xxxxxxx> wrote:

Hi folks,

 

I have been following the Flux project with great interest for some time now. But there is one – ok, probably more than one – question that I find vexing: How does Flux’ synchronization relate to the possibility to open a second synchronization channel via versioning repositories like Git?

 

Suppose you have a Project in Eclipse shared with EGit, connected to Flux. Then you share the same project remotely via Orion’s Team API with the same Git repo.  If you don’t do anything, you could end up with arbitrary merge conflicts when users (inadvertently) commit changes from both, Eclipse and Orion. To it would seem natural to either prevent sharing projects on both sides or to keep the local and remote Git workspaces somehow in sync either…

 

Although I could find a quick answer in your mailing archive, you guys probably have a clever answer for that one already ;-)

 

Thanks you in advance and cheers,

Christoph

_______________________________________________
flux-dev mailing list
flux-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/flux-dev