conflict

There are 1 repository under conflict topic.

• bamarni / composer-bin-plugin

  No conflicts for your bin dependencies

  composerconflictdependencyexecutableisolationtool
  Language:PHP 445

• 2BAB / Seal

  A Gradle Plugin for resolving AndroidManifest.xml merge conflicts.

  androidandroid-gradle-pluginandroidmanifestconflict
  Language:Kotlin 230

• kinshukdua / LiveActionMap

  An attempt to map the areas with active conflict in Ukraine using open source twitter data.

  twitterosintmapukraineconflictgisgeospatialnlpnatural-language-processing
  Language:Python 173

• capslocky / git-rebase-via-merge

  Fix rebase conflicts with minimum pain.

  gitrebasemergeconflict
  Language:Shell 77

• chadmcox / Active_Directory_Scripts

  Making my local storage of useful AD Scripts available to everyone.

  activedirectoryusersgroupscomputerssitessitelinkssubnetsstalesecurityconflictprivilegeadmincountreportspowershellscriptreplicationupn
  Language:PowerShell 67
• tailwind-merge-php

  YieldStudio / tailwind-merge-php

  Merge multiple Tailwind CSS classes and automatically resolves conflicts between them without headaches ! First-class support for Laravel ✨

  classlistconflictcsslaravelmergeoverridephptailwindtailwindcss
  Language:PHP 42

• conflictjs / conflict

  The first and only complete UI framework for Discord

  discorddiscordjsnodejsjsxconflict
  Language:JavaScript 33

• favstats / uaconflict_equipmentloss

  This repo scrapes Oryxspioenkop (daily) to document and visualize equipment losses in the Russia-Ukraine war. https://www.oryxspioenkop.com/2022/02/attack-on-europe-documenting-equipment.html

  warukrainewarukraine-invasionconflictdatadata-visualization
  Language:R 33

• coreybutler / porthog

  Identify which process is using a specific port.

  conflictdetectionmanagementportport-conflictportscanner
  Language:JavaScript 27

• Symbolk / IntelliMerge-UI

  The intuitive UI for IntelliMerge, where the developers can merge code and resolve conflicts.

  gitmergerefactoringconflict
  Language:Java 23

• jonschlinkert / add-filename-increment

  When copying or moving files, it's common for operating systems to automatically add an increment or 'copy' to duplicate file names. This does that for Node.js applications, with automatic platform detection and support for Linux, MacOs, and Windows conventions.

  filenamepathfilenamefilepathfsrenameconflictconflictsduplicatedirentincrementnodenodejsjavascriptjonschlinkert
  Language:JavaScript 22

• Symbolk / IntelliMerge

  A graph-based refactoring-aware three-way merging tool for Java programs.

  conflictgitmergerefactoring
  Language:Java 20

• fuzailpalnak / kaizen

  A library to map match and help tackle the problem of overlapping/intersecting road and building footprint that arises in the process of map making

  geographical-information-systemastar-algorithmobstacle-avoidancerealignmentmultiple-intermediate-goalsroad-elementspathfindingconflictnavigationiterative-closest-pointmap-matchingmap-makingmap-matchpathfinderbuilding-footprintsroadnetwork
  Language:Python 19

• ruarq / ukraine-war-heatmap

  Ukraine War Map/Heatmap

  ukraineukraine-invasionheatmapconflictpython3foliumukrainewillstandheatmap-visualizationukraine-war-heatmaphelp-ukrainenlpnatural-language-processingredditreddit-api
  Language:HTML 13

• tiexiu / SegmentPager

  头视图+标题栏+横滚视图

  segmentpagerscrollviewconflict
  Language:Objective-C 12

• ConFooBio / gmse

  An R package for simulating Generalised Management Strategy Evaluation

  management-strategy-evaluationmanagement-decisionsadaptive-managementgame-theorypopulation-modelwildlife-managementconservationecological-modellingecological-modelsecologyconflictconflict-resolutiongenetic-algorithmgenetic-algorithmsr-packagefood-securityagricultural-modellingsimulation
  Language:TeX 10

• GrantBirki / borscht

  Borscht - A Russian service monitor to track the uptime of domains and services

  monitoringukrainerussianconflictddoseducational
  Language:JavaScript 10

• a-paxton / emotion-dynamics

  Code and subset of data for "An exploratory analysis of emotion dynamics between mothers and adolescents during conflict discussions" (Main, Paxton, & Dale, 2016, Emotion).

  data-analysisjournal-articlepsychologycognitive-scienceadolescenceconflicthuman-subjectsrecurrence-quantification-analysiscrqacross-recurrenceaffectemotionsynchronyspaffspecific-affect-coding-system
  Language:R 9

• zied-snoussi / git-test

  This repository serves as a testbed for learning and practicing Git and GitHub workflows.

  branchesconflictgitgithubgithub-configmergepull-request
  Language:Java 9

• kirilkirkov / Sudoku-Solver

  PHP Based Sudoku Puzzle Solving

  sudoku-solversudokusudoku-puzzlephp-sudoku-solverbacktracking-algorithmbacktrackingconflict
  Language:PHP 8

• TonyReet / iOS-flutter-gesture-conflict

  Gesture conflict resolution for iOS and flutter.iOS和flutter手势冲突问题解决.

  iosflutterdartgestureconflict
  Language:Objective-C 8

• artemanufrij / findfileconflicts

  An elementary OS app

  valalinuxconflictduplicates
  Language:Vala 7

• crazyzhangxl / ScrollDemo

  有关滑动的demo样例

  javaandroidscrollmaterialdesignconflictnestedscrollingdemogridelayoutmanage
  Language:Java 7

• jonschlinkert / conflicts

  Detects when a new file is different than an existing file and prompts the user for action.

  conflictconflictsfilefsdetectpromptwritefile-systemnodenodejsjavascriptjonschlinkertvinylgulpfiles
  Language:JavaScript 6
• copro

  JannisHoch / copro

  (ML) model for computing conflict risk from climate, environmental, and societal drivers.

  climateconflictriskprojectionsecurityenvironment
  Language:Jupyter Notebook 5

• sillsdev / chorus

  End-user collaboration library via 3-way xml merging and hg dvcs under the hood

  chorussynchronizationconflictxmlmergesend-receivedvcshgfieldworkshacktoberfest
  Language:C# 5

• Symbolk / MergeScenarioMiner

  Python scripts to mine and collect merge scenarios from Git repositories.

  gitmergeconflict
  Language:Python 5

• EricHorvat / gitEasyChangelog

  A python tool which helps with changelog/release file conflicts with git

  pythongitconflict
  Language:Python 4

• jonschlinkert / gulp-conflicts

  Detects when a file to be written is different than an existing file and, if necessary, prompts the user for action.

  conflictsgulpgulppluginthroughfilesconflictdetectpromptstreamnodenodejsjavascript
  Language:JavaScript 4

• namoscato / resolve-composer-conflict

  Utility to automatically resolve composer.lock git conflicts

  composerconflict-resolutiongitgit-conflictsconflictresolver
  Language:JavaScript 4

• acaloiaro / prwatch-action

  Github action for monitoring pull requests on a repository

  jiraconflictmonitoringproject-management
  Language:Go 3

• AI-4-SE / CfgNet

  CfgNet models the configuration landscape of software projects to enable the early detection of configuration dependency conflicts across the used technology stack.

  configurationconflictdependency
  Language:Python 3

• jeremy-allen / getACLED

  an R function to ingest ACLED event data using jsonlite for ingestion and data.table for processing

  revent-dataacledconflictfunctionsafricaasiadata-table
  Language:R 3

• martinstarman / mersge

  Simple 3-way merge editor for the terminal

  conflictconflictsconsolegitmergeterminalrustrust-lang
  Language:Rust 3

• Sonikak004 / Try-Gitflow

  practicing Gitflow with an empty repo!

  conflictdevgitflow
  3

• JesusFerVid-ACN / MergeTesting

  Explica con ejemplos los conceptos de de Merge, Rebase, Pull Request y Stash.

  cliconflictconflict-resolutiongitmergepull-requestrebasestashvscode
  Language:CSS 2