[DPP-Robot] [dpp:feature-requests] #130 Explicit accept/merge of code contributions

[Franz Z. <fra...@us...>]

- **status**: open --> wont-fix
- **Comment**:

Don't confuse Saros with version control (e.g. provided by SVN or Git). See the Saros feature description: http://www.saros-project.org/features

> The core functionality of Saros is to support collaborative editing of text files.
> The task of Saros is to synchronize the work at any time. 

The feature you request is not the use case Saros is meant for.



---

** [feature-requests:#130] Explicit accept/merge of code contributions**

**Status:** wont-fix
**Group:** None
**Created:** Thu Jun 22, 2017 07:38 PM UTC by tasty_wheat
**Last Updated:** Thu Jun 22, 2017 07:38 PM UTC
**Owner:** nobody


Whenever a user saves a file that has contributions from others those contributions are automatically "merged" with the local copy.  This is fine for paired programming but not so much when contibutors are working on separate parts of a project.  There should be some kind of process for explicitly accepting contributions to be added to local files.  Otherwise a save action will only save the current user's changes to disk.


---

Sent from sourceforge.net because dpp...@li... is subscribed to https://sourceforge.net/p/dpp/feature-requests/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/dpp/admin/feature-requests/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.