{"@context":"https://w3id.org/codemeta/3.0","@type":"SoftwareSourceCode","identifier":"pkg:hackage/git-mediate@1.0","name":"git-mediate","description":"Git conflict resolution has never been easier\n\nWhen encountering a conflict, you can sometimes\nimagine: if only I could have applied one of\nthese patches BEFORE the other rather than\nconcurrently, I wouldn't be in this mess!\n\nWell, with git-mediate, you can!\n\nIn any conflicted state - git-mediate shows you\nthe 2 diffs involved. By applying these diffs to\nthe base version and the other version, you\nemulate the situation where the patch had already\nexisted when the other had been applied.\n\nReapply git-mediate, it will validate that you've\nindeed applied it correctly, and bam: conflict\ndisappeared!\n\nGit-mediate also lets you handle modify/delete\nconflicts (there's no sane way in git to show\nwhat the modification actually was)\n\nGit-mediate also streamlines jumping to the\nconflicts with your editor, either with the `-e`\noption to invoke your editor, or via the standard\nline number format, which is parsed by all major\neditors, to allow use of \"jump to next error\"\nkeys.\n\nGit-mediate especially shines with automatic\nsource transformation tools such as renamers.\n\nIn a conflicted state, re-apply a rename that\ncaused the conflict, run git-mediate without\nopening any files, and the conflicts are gone!","version":"1.0","softwareVersion":"1.0","license":"https://spdx.org/licenses/GPL-2.0-only","codeRepository":"https://github.com/Peaker/git-mediate","issueTracker":"https://github.com/Peaker/git-mediate/issues","url":"https://github.com/Peaker/git-mediate","keywords":["development","gpl","program","Propose Tags"],"programmingLanguage":{"@type":"ComputerLanguage","name":"Haskell"},"maintainer":[{"@type":"Person","name":"EyalLotem"},{"@type":"Person","name":"YairChuchem"}],"author":[{"@type":"Person","name":"EyalLotem"},{"@type":"Person","name":"YairChuchem"}],"copyrightHolder":[{"@type":"Person","name":"EyalLotem"},{"@type":"Person","name":"YairChuchem"}],"dateCreated":"2016-12-20","dateModified":"2022-12-05","datePublished":"2016-12-20","copyrightYear":2016,"downloadUrl":"https://hackage.haskell.org/package/git-mediate-1.0/git-mediate-1.0.tar.gz","applicationCategory":"hackage","runtimePlatform":"hackage","developmentStatus":"active","sameAs":["https://hackage.haskell.org/package/git-mediate-1.0"],"https://www.w3.org/ns/activitystreams#likes":196,"https://forgefed.org/ns#forks":9}