Use magit-ediff to resolve merge conflicts (Example)
You can always just switch to buffer C and edit what the merged version should look like.
emacs  git  magit 
10 days ago
Home · JXA-Cookbook/JXA-Cookbook Wiki
JavaScript for Automation is a new feature in OS X Yosemite. It lets you control applications and the operating system using JavaScript language.
js  osx  automation  jxa  cookbook  code 
19 days ago
A New Golden Age for Computer Architecture | February 2019 | Communications of the ACM
CPUs. Intel offers CPUs with many cores enhanced by large multi-level caches and one-dimensional SIMD instructions, the kind of FPGAs used by Microsoft, and a new neural network processor that is closer to a TPU than to a CPU.19
paper  comparch  vlsi  trend 
21 days ago
« earlier      
ai ajax algo algorithms api app apple apps arch asm automation awesome bash biz blog book books browser c c++ career chelsea clang cli clojure code comphist compiler compsci concurrency course cpp craft cs css csv d3 data database datasci dataviz debug design desktop dev development distro dl do doc ds econ eda editor editors edu ee elisp emacs email essay excel fb finance firefox fp framework free functional game games gh git go golang google graph graphics gtd gui guide guru hacks hardware haskell hdl health history howto hpc humor ide interview ios java javascript js json jupyter kata lang language learn learning lecture lectures lib library lifehacks lint linux lisp list mac macosx make markdown math memory methodology ml mysql networking news nz opensource os oss osx overview oz package pandas paper papers parallel pattern patterns pdf people perf perl poli productivity prog proglang programming psych py python r ref reference research review ruby rust sci scm screencast search sec security shell socio software sql ssh startup stats style swdev sweng swift sysadmin talk tcl tech terminal test testing theory tip tips tmux tool tools toread travel trump tsp tut tutorial tutorials ubuntu uni unix utils ux verilog vid video vim viz vlsi web webdev wiki windows wiz workflow writing zsh

Copy this bookmark: