Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
153
Issues
153
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
4d629163
Commit
4d629163
authored
Sep 30, 2022
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ngrams] attempt to fix repo conflicts with `transformWith`
But I'm not sure I know what I'm doing...
parent
56a5dc6c
Pipeline
#3230
passed with stage
in 94 minutes and 35 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
Ngrams.hs
src/Gargantext/API/Ngrams.hs
+2
-1
No files found.
src/Gargantext/API/Ngrams.hs
View file @
4d629163
...
...
@@ -207,8 +207,9 @@ ngramsStatePatchConflictResolution
->
NgramsTerm
->
ConflictResolutionNgramsPatch
ngramsStatePatchConflictResolution
_ngramsType
_ngramsTerm
=
(
ours
,
(
const
ours
,
ours
),
(
False
,
False
))
--
= (ours, (const ours, ours), (False, False))
-- (False, False) mean here that Mod has always priority.
=
(
ours
,
(
const
ours
,
ours
),
(
True
,
False
))
-- (True, False) <- would mean priority to the left (same as ours).
-- undefined {- TODO think this through -}, listTypeConflictResolution)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment