Setting your branch to exactly match the remote branch can be done in two steps: git fetch origin git reset –hard origin/master If you want to save your current branch’s state before doing this (just in case), you can do: git commit -a -m “Saving my work, just in case” git branch my-saved-work Now your … Read more
Assuming you’re joining on columns with no duplicates, which is a very common case: An inner join of A and B gives the result of A intersect B, i.e. the inner part of a Venn diagram intersection. An outer join of A and B gives the results of A union B, i.e. the outer parts … Read more
Native deep cloning There’s now a JS standard called “structured cloning”, that works experimentally in Node 11 and later, will land in browsers, and which has polyfills for existing systems. structuredClone(value) If needed, loading the polyfill first: import structuredClone from ‘@ungap/structured-clone’; See this answer for more details. Older answers Fast cloning with data loss – … Read more
As of August 2020: Modern browsers have support for the String.replaceAll() method defined by the ECMAScript 2021 language specification. For older/legacy browsers: function escapeRegExp(string) { return string.replace(/[.*+?^${}()|[\]\\]/g, ‘\\$&’); // $& means the whole matched string } function replaceAll(str, find, replace) { return str.replace(new RegExp(escapeRegExp(find), ‘g’), replace); } Here is how this answer evolved: str = … Read more
Try: git mergetool It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand editing afterwards, but usually it’s enough by itself. It is much better than doing the whole thing by hand certainly. As per Josh Glover’s comment: [This command] … Read more
Quick note, my answer is almost certainly confusing Big Oh notation (which is an upper bound) with Big Theta notation “Θ” (which is a two-side bound). But in my experience, this is actually typical of discussions in non-academic settings. Apologies for any confusion caused. BigOh complexity can be visualized with this graph: The simplest definition … Read more
In Git 1.7.0 and later, you can checkout a new branch: git checkout -b <branch> Edit files, add and commit. Then push with the -u (short for –set-upstream) option: git push -u origin <branch> Git will set up the tracking information during the push.
On Python ≥ 3.5, use pathlib.Path.mkdir: from pathlib import Path Path(“/my/directory”).mkdir(parents=True, exist_ok=True) For older versions of Python, I see two answers with good qualities, each with a small flaw, so I will give my take on it: Try os.path.exists, and consider os.makedirs for the creation. import os if not os.path.exists(directory): os.makedirs(directory) As noted in comments … Read more
Using regular expressions is probably the best way. You can see a bunch of tests here (taken from chromium) const validateEmail = (email) => { return String(email) .toLowerCase() .match( /^(([^<>()[\]\\.,;:\s@”]+(\.[^<>()[\]\\.,;:\s@”]+)*)|(“.+”))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ ); }; Here’s the example of a regular expression that accepts unicode: const re = /^(([^<>()[\]\.,;:\s@\”]+(\.[^<>()[\]\.,;:\s@\”]+)*)|(\”.+\”))@(([^<>()[\]\.,;:\s@\”]+\.)+[^<>()[\]\.,;:\s@\”]{2,})$/i; But keep in mind that one should not rely … Read more
Assuming the hash of the commit you want is c5f567: git checkout c5f567 — file1/to/restore file2/to/restore The git checkout man page gives more information. If you want to revert to the commit before c5f567, append ~1 (where 1 is the number of commits you want to go back, it can be anything): git checkout c5f567~1 … Read more