Anyone know a faster way to get through merge conflicts? Preferably on the terminal, I'm imagining a 'git add -p' style interface that shows all conflicts in all tracked files but with options to accept current or incoming like in vs code.

Also I'm not a big fan of vimdiff, it's slow to start (this is in Cygwin on Windows so everything is slow to start!), it only does one file at a time, and the colors make it hard to read. Also, I couldn't find shortcuts to accept current or incoming. This is vim, so all of these problems except the speed are solvable, but the speed is a deal breaker.

#git #askfedi #vimdiff #mergeconflicts

Former ICE Employee: "I swore an oath to protect the nation when I signed up. I followed it when I resigned a little over a week ago. I am duty bound to report the legally required training program at the ICE academy is deficient, defective, and broken. I received secretive orders to teach cadets to violate the Constitution"

Read that again.

Ordered. To violate. The Constitution.
This isn’t partisan spin. This is about the rule of law.

Repost please!! 🙏

#BlueCrew #ProudBlue #ICE #AbolishICE

I maintain pypandoc — 14M downloads/month, used by Adobe, Google, Microsoft, Apple, OpenAI and many more.

I just overhauled my sponsorship pages. If you or your company depend on open source infrastructure (you do), here's how to help keep it maintained:

💛 https://github.com/sponsors/JessicaTegner

Open source has a free-rider problem. You can be part of the solution.

#OpenSource #Python #FOSS #FundOpenSource