merge-conflicts
merge-conflicts copied to clipboard
Function.extractParams is deprecated.
Assigning custom properties to a marker when creating/copying it is deprecated. Please, consider storing the custom properties you need in some other object in your package, keyed by the marker's id property.
Function.extractParams (/opt/atom/resources/app.asar/node_modules/text-buffer/lib/marker.js:43:14)
MarkerLayer.markRange (/opt/atom/resources/app.asar/node_modules/text-buffer/lib/marker-layer.js:196:71)
DisplayMarkerLayer.markBufferRange (/opt/atom/resources/app.asar/node_modules/text-buffer/lib/display-marker-layer.js:90:62)
TextEditor.markBufferRange (/opt/atom/resources/app.asar/src/text-editor.js:1753:38)
ConflictVisitor.markSide (/home/amit/.atom/packages/merge-conflicts/lib/conflict.js:308:38)
ConflictVisitor.visitTheirSide (/home/amit/.atom/packages/merge-conflicts/lib/conflict.js:301:29)
+1
Me two +1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
Instead of just adding "+1" (did you know you can just thumbsup the first message ?) until the end of time, does anyone understand the issue/have an idea of how to fix this ?
@pichouk I think the suggested solution was in the first message of this issue. I just don't see any movement on this repo.
This was actually fixed in smashwilson/merge-conflicts#265, I just, uh, never actually did the release. 😅 I just pushed 1.4.5 with that PR merged, but completely untested because, as some of you have noticed:
I just don't see any movement on this repo.
:sparkles: This repository is being deprecated :sparkles:
The full announcement is there, but the short version is that there's a better core package now that eclipses the functionality in this one :grin: