Our great sponsors
-
> Sadly, even Google is so confused about Git VS GitHub that searching for "git blog" shows github.blog as the first result...
Does https://git-scm.com/ even have a blog? I don't think Google is confused, it's just trying to give you the most relevant results.
-
(plug) delta does special display of diff3 merge conflicts: https://github.com/dandavison/delta#merge-conflicts
It displays two diffs: one from the ancestral commit to “ours” and one from the ancestral commit to “theirs”. I find it helpful for understanding conflicts and how to resolve them — any feedback appreciated.
-
WorkOS
The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.
-
That should open this in your editor:
https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/...
Change the url and sha256, then
brew install git
-
vim-quickfix-conflicts
Add git conflicts to your vim quickfix list to speedily hop to the next conflict marker
Git jump is interesting, not new in this release (in 2.19) but I wasn't aware of it. I'm generally already in vim in another shell though, so I want the quickfix list populated there, not in a new instance.
A while ago I wrote a vim plugin for this, has a bug where it (only sometimes?) won't go to the last conflict, but it's been helpful enough that I use it frequently.
https://github.com/OJFord/vim-quickfix-conflicts
(Yes, shameless promotion/maybe bait someone more familiar with vimscript into using it and immediately spotting cause of the above!)
-
feedback
Discontinued Public feedback discussions for: GitHub for Mobile, GitHub Discussions, GitHub Codespaces, GitHub Sponsors, GitHub Issues and more! [Moved to: https://github.com/github-community/community]
In the official feedback discussions [1] from December 2021, the answer for this question was "won't start working on it for 2-4 months".
[1]: https://github.com/github/feedback/discussions/7744#discussi...
-
InfluxDB
Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.