The key to solve conflicts: see the two conflicting diffs Updated 2025-01-10 +Created 1970-01-01
The key to solve conflicts is:
You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.
Or in other words, at every rebase conflict we have something like:Therefore there are 2 diffs that you have to understand and reconcile:
master-commit feature-commit
| |
| |
base-commit------+
|
|base-committomaster-commitbase-committofeature-commit
@cirosantilli/_file/python/typing_cheat/python/typing_cheat/union.py Updated 2025-01-10 +Created 1970-01-01
wikix.binets.fr runs an internal MediaWiki instance available to all logged in alumni.
This is likely the easiest one to produce as the frequencies are lower, which is why it was discovered first. TODO original setup.
Also because it is transparent to brick and glass, (though not metal) it becomes good for telecommunication.
Some notable subranges:
Diffraction of Cathode Rays by a Thin Film by Thomson and Reid (1927) Updated 2025-01-10 +Created 1970-01-01
The ELF standard specifies multiple file formats:
- Object files (
.o).Intermediate step to generating executables and other formats:Source code | | Compilation | v Object file | | Linking | v ExecutableObject files exist to make compilation faster: withmake, we only have to recompile the modified source files based on timestamps.We have to do the linking step every time, but it is much less expensive.
- Executable files (no standard Linux extension).This is what the Linux kernel can actually run.
- Archive files (
.a).Libraries meant to be embedded into executables during the Linking step.
- Shared object files (
.so).Libraries meant to be loaded when the executable starts running.
- Core dumps.Such files may be generated by the Linux kernel when the program does naughty things, e.g. segfault.They exist to help debugging the program.
In this tutorial, we consider only object and executable files.
420 to 680 nm for sure, but larger ranges are observable in laboratory conditions.
Schematic of the Davisson-Germer experiment
. Source. 
Direct consequence of Euclid's formula.
TODO quick summary of game rules? Perhaps: battlecode.org/assets/files/battlecode-guide-xsquare.pdf
Some mechanics:
- inter agent communication
- compute power is limited by limiting Java bytecode count execution per bot per cycle
There are unlisted articles, also show them or only show them.