Bug 436017 - Improve conflict behavior/handling when pulling snippets from Git repository
Summary: Improve conflict behavior/handling when pulling snippets from Git repository
Status: NEW
Alias: None
Product: z_Archived
Classification: Eclipse Foundation
Component: Recommenders (show other bugs)
Version: unspecified   Edit
Hardware: PC Mac OS X
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-28 04:14 EDT by Johannes Dorn CLA
Modified: 2019-07-24 14:36 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Johannes Dorn CLA 2014-05-28 04:14:39 EDT 
This is an umbrella bug to collect findings about the behavior of Snipmatch when it encounters conflicts when pulling remote changes from the GIT repository.
Comment 1 Johannes Dorn CLA 2014-05-28 04:41:43 EDT 
Scenario: local change of a snippet file conflicts with a remote change.
Behavior: Snipmatch posts a warning to the error log, telling the user, that he is working with a non up to date local version.
Comment 2 Andreas Sewe CLA 2015-04-29 08:22:58 EDT 
Classifying as enhancement request.