Giter VIP home page Giter VIP logo

Comments (1)

ericcurtin avatar ericcurtin commented on September 1, 2024

Never mind, I wrote a script to do it:

#!/bin/bash
  
git fetch > /dev/null 2>&1 &

ls_files=$(git diff --name-only --diff-filter=U)
np=$(nproc)

if [ -z "$ls_files" ]; then
  echo "No conflicts here!"
  exit 0
fi

task() {
  for i in $(git blame $i | awk '/<<<</,/>>>>/' | awk '{print $1}' | grep -v 0000 | sort | uniq); do
    if [ $(git branch -r --contains $i | grep -c "$1$\|$2$") -lt 2 ]; then
      git log --no-walk --pretty=format:"%h%x09%an%x09%ad%x09%s" $i | cut -c 1-80
    fi
  done
}

for i in $(echo $ls_files); do
  # Max 16 processes at any given time
  while [ $(jobs -r -p | wc -l) -gt $np ]; do
    sleep 1
  done

  task $1 $2&
done

wait

Sorry for bothering you, you have to pass in the two branches to this

from git-imerge.

Related Issues (20)

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.