Ecosyste.ms: Issues

An open API service for providing issue and pull request metadata for open source projects.

GitHub / smashwilson/merge-conflicts issues and pull requests

#273 - Deprecation notice

Pull Request - State: closed - Opened by smashwilson over 7 years ago

#272 - Add setting to skip stage

Pull Request - State: open - Opened by gunnan99 over 7 years ago

#271 - Support custom project path for conflict detection

Pull Request - State: closed - Opened by yanfeng42 over 7 years ago

#270 - Search for conflicts only restricted to a subfolder

Issue - State: open - Opened by np-code2 over 7 years ago - 1 comment

#269 - Add option to keep both changes

Issue - State: open - Opened by douglascamata over 7 years ago - 2 comments

#268 - Uncaught Error: Can't save destroyed buffer

Issue - State: closed - Opened by guilhermejcgois over 7 years ago - 2 comments

#267 - Navigation between distant conflicts in a single file?

Issue - State: open - Opened by CodeMan99 over 7 years ago - 1 comment

#266 - [Feature Request] Minimap Plugin?

Issue - State: open - Opened by r0ckarong over 7 years ago - 1 comment

#265 - Fixes deprecation call to assign custom properties to a marker #262

Pull Request - State: closed - Opened by dbachko over 7 years ago - 1 comment

#264 - Overlapping

Issue - State: open - Opened by jacopocarlini over 7 years ago - 1 comment

#263 - No conflicts detected.

Issue - State: closed - Opened by nobleach over 7 years ago - 4 comments

#262 - Function.extractParams is deprecated.

Issue - State: open - Opened by coolamit1240 over 7 years ago - 23 comments

#261 - Colored Conflict Bars display over other panels

Issue - State: open - Opened by rpennell over 7 years ago - 1 comment

#260 - Notification of stage locks file

Issue - State: open - Opened by rpennell over 7 years ago - 1 comment

#259 - Cannot read property 'registerContextApi' of undefined

Issue - State: open - Opened by iki over 7 years ago - 1 comment

#258 - Request: Add option to auto-stage

Issue - State: open - Opened by vprigent over 7 years ago

#257 - Request: Add support for mini-map

Issue - State: open - Opened by jolsen71 almost 8 years ago - 1 comment

#256 - UI conflicts with tree view when docked on the right side

Issue - State: open - Opened by mikemerritt almost 8 years ago - 5 comments

#255 - Document Shortcut for Detect Merge Conflicts in Menu Entry

Issue - State: open - Opened by kiryph almost 8 years ago - 1 comment

#254 - Function.extractParams is deprecated.

Issue - State: closed - Opened by mikemcbride almost 8 years ago - 4 comments
Labels: duplicate

#252 - Line inserted just after marker is not treated as body

Issue - State: open - Opened by ypresto almost 8 years ago - 1 comment

#251 - Headers break out of the file's pane

Issue - State: closed - Opened by kevinansfield about 8 years ago - 2 comments
Labels: duplicate

#250 - Theme with large buttons hides conflict's first line

Issue - State: closed - Opened by mateosss about 8 years ago - 6 comments

#249 - Fix diff3 markers

Issue - State: open - Opened by sergeysova about 8 years ago - 5 comments

#248 - Fix merge base marker is not removed on quit

Pull Request - State: closed - Opened by ypresto about 8 years ago - 1 comment

#247 - Side-by-side diff for each conflicting change sets

Issue - State: open - Opened by ypresto about 8 years ago - 3 comments
Labels: enhancement

#245 - Added installation instructions to readme

Pull Request - State: closed - Opened by amilajack about 8 years ago - 1 comment

#244 - Keep both?

Issue - State: closed - Opened by jglovier over 8 years ago - 4 comments

#243 - Nothing to merge

Issue - State: open - Opened by ayberkozgur over 8 years ago - 6 comments

#242 - Uncaught Error: Cannot decorate a destroyed marker

Issue - State: closed - Opened by PierreGUI over 8 years ago - 2 comments

#241 - Uninstalling “merge-conflicts” failed

Issue - State: closed - Opened by miclaus over 8 years ago - 1 comment

#240 - Doesn't work with the 'Seti' theme

Issue - State: open - Opened by RigoOnRails over 8 years ago - 6 comments

#239 - UI showing on top of Atom's footer bar

Issue - State: open - Opened by adamreisnz over 8 years ago - 1 comment

#238 - Uncaught TypeError: Illegal invocation

Issue - State: open - Opened by 50Wliu over 8 years ago - 5 comments

#237 - Custom repository contexts: show, hide, complete, quit and multi-context projects

Pull Request - State: closed - Opened by mostafaeweda over 8 years ago - 4 comments

#236 - Normalize paths coming from git

Pull Request - State: closed - Opened by aroig over 8 years ago - 3 comments

#235 - Avoid "Use me" <atom-overlay> to scroll over conflicts panel

Pull Request - State: closed - Opened by orioltf over 8 years ago - 3 comments

#234 - Stage popup button does nothing/cannot be dismissed

Issue - State: open - Opened by rzeigler over 8 years ago - 2 comments

#233 - merge-conflicts package fails to load on Atom start up

Issue - State: closed - Opened by web-snake over 8 years ago - 2 comments

#232 - feature request: keep both

Issue - State: closed - Opened by keyboSlice over 8 years ago - 1 comment

#231 - Failed to load the merge-conflicts package

Issue - State: closed - Opened by MattRiesterer over 8 years ago - 9 comments

#230 - Documentation on key binding customization.

Pull Request - State: closed - Opened by smashwilson over 8 years ago - 1 comment

#229 - Refactor the Conflict parser.

Pull Request - State: closed - Opened by smashwilson over 8 years ago

#227 - Conflict resolution controls doesn't appear with 1.4.x

Issue - State: closed - Opened by emileber over 8 years ago - 12 comments

#226 - Code editor overlay

Issue - State: closed - Opened by tn over 8 years ago - 1 comment

#225 - Marks wrong lines on diff3 without base content

Issue - State: closed - Opened by ypresto over 8 years ago - 2 comments

#224 - UI disappears

Issue - State: open - Opened by irudoy over 8 years ago - 1 comment

#223 - Finds conflicted files but no visual feedback

Issue - State: closed - Opened by stevenbriscoeca over 8 years ago - 3 comments

#222 - Register custom repository contexts

Pull Request - State: closed - Opened by mostafaeweda over 8 years ago - 3 comments

#221 - Transact resolve() to group undo operation

Pull Request - State: closed - Opened by ypresto over 8 years ago - 3 comments

#220 - Fix hangs with broken conflict marker

Pull Request - State: closed - Opened by ypresto over 8 years ago

#219 - Add three-way merge markers support

Pull Request - State: closed - Opened by ypresto over 8 years ago - 4 comments

#217 - Uncaught Error: spawn ENOTDIR

Issue - State: closed - Opened by pierreglardon over 8 years ago - 1 comment

#216 - Uncaught TypeError: Cannot read property 'detect' of undefined

Issue - State: open - Opened by hybrisCole over 8 years ago - 2 comments

#215 - Uncaught Error: Cannot find module 'space-pen'

Issue - State: closed - Opened by creekpld over 8 years ago - 2 comments

#214 - How Do I Personalize the keybinding?

Issue - State: closed - Opened by eltommy99 over 8 years ago - 2 comments

#213 - Allow use as a git merge tool

Issue - State: open - Opened by ChristopherKing42 over 8 years ago - 1 comment

#212 - Breaks when used with atom-editorconfig

Issue - State: closed - Opened by simon-ls over 8 years ago - 1 comment

#210 - Failed to activate merge-conflicts package

Issue - State: open - Opened by Abhis3798 over 8 years ago - 1 comment

#209 - In conflict resolution, branch name get over the rest if the UI.

Issue - State: closed - Opened by Succo over 8 years ago - 3 comments

#208 - Merge conflicts interface disappears when going to next file

Issue - State: open - Opened by adamreisnz over 8 years ago - 5 comments

#207 - [wip] Use block decorations for CoveringViews

Pull Request - State: open - Opened by smashwilson over 8 years ago - 2 comments

#206 - Port to JavaScript and Etch

Issue - State: open - Opened by smashwilson over 8 years ago

#205 - Use nodegit if available

Pull Request - State: closed - Opened by smashwilson over 8 years ago

#204 - Error when using merge-conflicts on files with Windows UNC path

Issue - State: closed - Opened by jolsen71 over 8 years ago - 1 comment

#203 - Show some kind of "in progress" indicator for particular events

Issue - State: closed - Opened by ghost over 8 years ago

#202 - Doesn't work when EditorConfig is enabled

Issue - State: closed - Opened by ghost over 8 years ago - 1 comment

#201 - Unable to set Get Path in settings

Issue - State: open - Opened by markcol over 8 years ago - 1 comment

#200 - [WIP] Add UI element for alternate resolution strategies like "Keep Both"

Pull Request - State: open - Opened by al-the-x over 8 years ago - 3 comments

#199 - Any stage after first one fails with locked index error

Issue - State: open - Opened by steelbrain over 8 years ago - 2 comments

#198 - Merge staging seems to do whole file replace instead of tracking hunks

Issue - State: open - Opened by smiffy6969 over 8 years ago - 2 comments

#197 - no longer finds conflicts

Issue - State: closed - Opened by SlimeQ over 8 years ago - 1 comment

#196 - Doesn't find merge conflicts tags in open file

Issue - State: open - Opened by msheaver almost 9 years ago - 16 comments

#195 - feat(cli): create git merge compatible mergetool script

Pull Request - State: closed - Opened by dudymas almost 9 years ago - 2 comments

#194 - Uncaught Error: Failed to create locked file '.../.git/index.lock...

Issue - State: closed - Opened by averrin almost 9 years ago - 2 comments

#193 - Uncaught Error: The index is locked. This might be due to a concurrent or crashed process

Issue - State: closed - Opened by grushetsky almost 9 years ago - 5 comments
Labels: duplicate

#192 - checkoutSide takes more arguments now.

Pull Request - State: closed - Opened by smashwilson almost 9 years ago

#191 - Stage with git-utils

Pull Request - State: closed - Opened by smashwilson almost 9 years ago

#190 - verticallyScrollable is no longer a thing

Pull Request - State: closed - Opened by smashwilson almost 9 years ago

#189 - Does not work if top-level project is not a git repo.

Issue - State: open - Opened by xiata almost 9 years ago - 6 comments

#188 - Conflict header overlay positioning bug

Issue - State: open - Opened by simonlayfield almost 9 years ago - 17 comments

#187 - Uncaught TypeError: this.editor.verticallyScrollable is not a function

Issue - State: closed - Opened by averrin almost 9 years ago - 15 comments
Labels: boom

#186 - Uncaught TypeError: GitBridge.getActiveRepo is not a function

Issue - State: open - Opened by nemccall almost 9 years ago - 3 comments
Labels: boom

#185 - Add a "Keep Both" strategy?

Issue - State: open - Opened by al-the-x almost 9 years ago - 12 comments

#184 - Insufficient contrast of the text on the blue and green conflict headers

Issue - State: open - Opened by BrianHawley about 9 years ago - 1 comment
Labels: interface

#183 - Going to next issue doesn't show UI

Issue - State: open - Opened by seriema about 9 years ago - 2 comments
Labels: boom

#182 - Uncaught TypeError: repo.getWorkingDirectory is not a function

Issue - State: closed - Opened by esetnik about 9 years ago - 1 comment
Labels: boom

#179 - Resolve entire file throws Uncaught TypeError: undefined is not a function

Issue - State: open - Opened by wolfgang42 about 9 years ago - 8 comments
Labels: boom

#171 - Git add failed: exit code 128 (solved by itself)

Issue - State: open - Opened by UnconventionalMindset about 9 years ago - 44 comments

#139 - Implement a "why" button

Issue - State: open - Opened by smashwilson over 9 years ago - 5 comments
Labels: large, interface

#128 - Uncaught Error: spawn EACCES

Issue - State: closed - Opened by wjn over 9 years ago - 3 comments

#71 - Abnormal git exit: "C:\Program' is not recognized as an internal or external command

Issue - State: closed - Opened by aronj about 10 years ago - 2 comments

#13 - Grant achievements on successful merge

Issue - State: open - Opened by rgbkrk over 10 years ago - 5 comments
Labels: enhancement

#9 - Support three-way merge markers

Issue - State: closed - Opened by smashwilson over 10 years ago - 10 comments
Labels: enhancement