Code Monkey home page Code Monkey logo

conflict-bot's People

Contributors

azanli avatar

Stargazers

 avatar

Watchers

 avatar

conflict-bot's Issues

Cannot run conflict-bot

I tested this out with a PR on one of my projects and got this error:

node:internal/modules/cjs/loader:1031
  throw err;
  ^

Error: Cannot find module '@actions/core'
Require stack:
- /home/runner/work/_actions/depandabot/conflict-bot/v1/index.js
    at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1028:15)
    at Function.Module._load (node:internal/modules/cjs/loader:873:27)
    at Module.require (node:internal/modules/cjs/loader:1100:19)
    at require (node:internal/modules/cjs/helpers:119:18)
    at Object.<anonymous> (/home/runner/work/_actions/depandabot/conflict-bot/v1/index.js:1:14)
    at Module._compile (node:internal/modules/cjs/loader:1198:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1252:10)
    at Module.load (node:internal/modules/cjs/loader:107[6](https://github.com/houseabsolute/precious/actions/runs/6669165413/job/18126338149#step:3:7):32)
    at Function.Module._load (node:internal/modules/cjs/loader:911:12)
    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:[8](https://github.com/houseabsolute/precious/actions/runs/6669165413/job/18126338149#step:3:9)1:[12](https://github.com/houseabsolute/precious/actions/runs/6669165413/job/18126338149#step:3:13)) {
  code: 'MODULE_NOT_FOUND',
  requireStack: [ '/home/runner/work/_actions/depandabot/conflict-bot/v1/index.js' ]
}```

The full logs are at https://github.com/houseabsolute/precious/actions/runs/6669165413/job/18126338149

Warning level for file collisions

Hi,

I am currently in Merge Purgatory and was looking around for tools like this one.

It looks like this detects line-level collisions only?

Since this is intended as an "early warning system", it might be a good idea to also warn people of file-level collisions - these are much more likely to occur, but lines colliding does not necessarily happen, even in files that end up being unmergeable. It's entirely possible to have no merge conflicts, and still end up with code that makes no sense.

What I'd want from a script like this, is the opportunity to know it before I'm stepping on another team member's toes - if we're both working on the same files, it's not unlikely we'll end up with a conflict soon, and this should prompt us to communicate and coordinate early on, "hey, I'm working on this thing in that file, let's talk".

Thoughts?

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.