mellowagain / gitarena

Software development platform with built-in vcs, issue tracking and code review
MIT License
86 stars 11 forks source link

Repository importing and mirroring #21

Open mellowagain opened 2 years ago

mellowagain commented 2 years ago

These two features should support the following VCS: Git, Subversion and Mercurial

For the later case, it is important to know how GitArena should handle conflicts (such as when code is changed on GitArena and then conflicts with a change that was pushed to the mirror). The following two solutions come to my mind:

I'm happy to discuss this and I'm open for suggestions.