git-weld v0.1.0-rc.1 — A semantic Git merge driver with a safe manual-conflict fallback

Sign in to join the discussion — your thebay.events account works here.