Git tips But which commit from master did we conflict with exactly? Updated 2025-07-11 +Created 1970-01-01
git rebase does not tell you that, and that sucks.We only know which commit from the feature branch caused the problem.
Generally we can guess or it is not needed, but
imerge does look promising: stackoverflow.com/questions/18162930/how-can-i-find-out-which-git-commits-cause-conflictsFor the strong.
git log --abbrev-commit --decorate --graph --pretty=oneline master HEADOutput:
* b4ec057 (master) 5
* 0b37c1b 4
| * fbfbfe8 (HEAD -> my-feature) 7
| * 7b0f59d 6
|/
* 661cfab 3
* 6d748a9 2
* c5f8a2c 1If we also add the As we can see, this removes any commit that is neither:
--simplify-by-decoration, which you very often want want on a real repository with many commits:* b4ec057 (master) 5
| * fbfbfe8 (HEAD -> my-feature) 7
|/
* c5f8a2c 1- under a branch or tag
- at the intersection of too branches or tags
In order to solve conflicts, you just have to understand what commit you are trying to move where.
E.g. if from:we do:what happens step by step is first 6 is moved on top of 5:and then 7 is moved on top of the new 6:
5 master
|
4 7 my-feature HEAD
| |
3 6
|/
2
|
1git rebase master6on5 HEAD
|
5 master
|
4 7 my-feature
| |
3 6
| |
2-----------------+
|
17on5 HEAD
|
6on5
|
5 master
|
4 7 my-feature
| |
3 6
| |
2-----------------+
|
17on5 my-feature HEAD
|
6on5
|
5 master
|
4
|
3
|
2
|
1Generate a minimal test repo. You should get in the habit of doing this to test stuff out.
#!/usr/bin/env bash
mkdir git-tips
cd git-tips
git init
for i in 1 2 3 4 5; do
echo $i > f
git add f
git commit -m $i
done
git checkout HEAD~2
git checkout -b my-feature
for i in 6 7; do
echo $i > f
git add f
git commit -m $i
doneOfficial demos: github.com/KhronosGroup/glTF-Sample-Assets These are visible at: github.khronos.org/glTF-Sample-Viewer-Release/ with a JavaScript viewer present at: github.com/KhronosGroup/glTF-Sample-Viewer TODO can you load models on the web?
Supports animations, e.g.:
gltf-viewer.donmccurdy.com/ is based on doesn't work with those examples because they have separate asset files.
f3d just worked for it.
The most important on in metabolism internals, everything else gets converted to it before being processed in the .
The user friendly Chess UI! Exactly what you would expect from a GNOME Project package. But also packs some punch via the Universal Chess Interface, e.g. Stockfish just works.
Centralized system that still attempts some level of privacy.
In it, a central bank issue tokens that are stored offline in your cell phone, a bit like cash bank notes.
When you take those tokens, a corresponding amount gets removed from your bank account, a bit like cash bank notes.
When a transaction is made, tokens are put into a spent token list via central API, and cannot be double spent thereafter. The corresponding ammount is then added to the bank account of the receiver. This also means that offline transactions are not possible.
This vocabulary likely entered Ciro Santilli's vernacular through playing Counter-Strike when he was a teenager.
April 2024: merged with some fraud protection thing, is it sill a Wiki? Unclear, seem sto have lost that aspect: twitter.com/judegomila/status/1783028847983956430
techcrunch.com/2019/04/30/golden-launch/Exactly! Deletionism on Wikipedia is so sad, and especially for companies. In particular e.g. Ciro Santilli tried to create a page for PsiQuantum, and it got reverted... and now golden has one of the largest Google hits for it: golden.com/wiki/PsiQuantum-PBDGXRA
Quote 1.
Golden wiki vs Deletionism on Wikipedia
. To state the obvious: Wikipedia is an incredibly useful website, but Gomila pointed out that notable companies and technologies like SV Angel, Benchling, Lisk and Urbit don’t currently have entries. Part of the problem is what he called Wikipedia’s “arbitrary notability threshold,” where pages are deleted for not being notable enough. (This is also what happened years ago to the Wikipedia page about yours truly — which I swear I didn’t write myself.)
TODO how do they do moderation?
As of April 2024Asked at: twitter.com/cirosantilli/status/1777250258235302233 Their last tweets were from August 2023, so maybe they just silently shutdown? Their name is too generic and hard to search for efficiently...
Login is currently disabled.
They do have knowledge graph built-in which is cool.
- There will be blood (2007). Business and cynicism. Also great music.
- Don't Look Up (2021). Politics.
Google 2FA app token can be updated without checking the old 2FA Updated 2025-07-11 +Created 1970-01-01
I need this for OurBigBook.com!! webmasters.stackexchange.com/questions/104241/can-google-analytics-track-url-fragment-in-url
They removed referrer path completely in GA4... OMG WTF are they doing!
Google has put considerable effort into custom hardware to greatly optimize its stack, in a way that is quite notable compared to other tech companies.
- 2021 www.theregister.com/2021/03/23/google_to_build_server_socs/ Google vows to build its own server system-on-chips, hires Intel veteran. Inevitable with the end of Moore's law. Instruction set architecture unannounced however. I'll bet ARM instruction set
- 2021 codec acceleration for YouTube: www.tomshardware.com/uk/news/intel-replaces-xeons-with-custom-vcus
Bibliography:
As of 2021, last updated 2016, and python 3.5 appears to be mandatory or else:which apparently broke in 3.6: stackoverflow.com/questions/41343263/provide-classcell-example-for-python-3-6-metaclass and
RuntimeError: __class__ not set defining 'AbstractBaseUser' as <class 'django.contrib.auth.base_user.AbstractBaseUser'>. Was __classcell__ propagated to type.__new__?pyenv install fails on Ubuntu 20.10, so... fuck. Workarounds at:but am I in the mood considering that the ancient Django version would require an immediate port anyways? Repo is at Django 1.0, while newest is now already Django 3. The Rails one is broken for the same reason. Fuck 2.
The "greatest common divisor" of two integers and , denoted is the largest natural number that divides both of the integers.
Unfortunately, physicists and mathematicians keep using Greek letters in their formulas, so we just have to learn them.
A helpful way to remember is to learn a bit of their history/pronunciation: Section "Historical correspondence between Latin and Greek".
To learn the greek letters if you have a base latin alphabet, you must learn the sound of each letter, and which Latin letters they correspond to.
Symbols that look like Greek letters but are not Greek letters:
Is Ciro Santilli crazy (he is, but for this point specifically), or do many/most Greek letters represent the mouth position used in the pronunciation of the letter?
There are unlisted articles, also show them or only show them.