First solve any potential conflicts that your branch had with master
before prettier
got merged:
$ git merge 677bbb7f0b8754787ff9e7bfab4602ba82e13b0b
Now merge with against the commit that merged the prettier
branch:
$ git checkout -b pr<PR number> origin/pr/<PR number> | |
# Try to merge the PR against the commit before prettier (to check if it had existing conflicts). | |
$ git merge 677bbb7f0b8754787ff9e7bfab4602ba82e13b0b | |
# if there are existing conflicts, abort and post failing message to the PR. | |
# else | |
$ git merge 1d9a4cafcf6cc288d675512db8fd984e13aab869 | |
# if there is any conflict, do the following: | |
$ git diff --diff-filter=U | |
# manually review that the conflicts are detected correctly. | |
# if they are not detected correctly, post failing message to the PR. |
./out/Atom Dev.app/Contents/Resources/electron.asar/browser/api/exports/electron.js (required by ./src/main-process/start.js) | |
./out/Atom Dev.app/Contents/Resources/electron.asar/browser/api/app.js (required by ./out/Atom Dev.app/Contents/Resources/electron.asar/browser/api/exports/electron.js) | |
./node_modules/nslog/lib/nslog.js (required by ./src/main-process/start.js) | |
./node_modules/nslog/build/Release/nslog.node (required by ./node_modules/nslog/lib/nslog.js) | |
./node_modules/temp/lib/temp.js (required by ./src/main-process/start.js) | |
./node_modules/rimraf/rimraf.js (required by ./node_modules/temp/lib/temp.js) | |
./node_modules/glob/glob.js (required by ./node_modules/rimraf/rimraf.js) | |
./node_modules/fs.realpath/index.js (required by ./node_modules/glob/glob.js) | |
./node_modules/fs.realpath/old.js (required by ./node_modules/fs.realpath/index.js) | |
./node_modules/minimatch/minimatch.js (required by ./node_modules/glob/glob.js) |
foo | array | ||
---|---|---|---|
bar |
|
Some stuff with italics, code without :rocket: emojis
and standard emojis: :party:
/** | |
* @format | |
*/ | |
const t = require('@babel/types'); | |
const babylon = require('@babel/parser'); | |
const invariant = require('invariant'); | |
const isGlobal = binding => !binding; |
### Keybase proof | |
I hereby claim: | |
* I am rafeca on github. | |
* I am rafeca (https://keybase.io/rafeca) on keybase. | |
* I have a public key whose fingerprint is 5C6B C9B2 D88D C96F 7234 F5FE 7843 562C FF5E E9B2 | |
To claim this, I am signing this object: |
async function fetchData() { | |
try { | |
const response = await fetch('https://api.spotify.com/v1/search?q=michael+jackson&type=album'); | |
const parsedResponse = await response.json(); | |
const ids = parsedResponse.albums.items | |
.map(item => item.id) | |
.slice(0, 5); | |
for (let id of ids) { |
I hereby claim:
To claim this, I am signing this object:
<script language="JScript"> | |
<!-- | |
ua=navigator.userAgent; | |
v=navigator.appVersion.substring(0,1); | |
if ((ua.lastIndexOf("MSIE")!=-1) && (v='4')) { | |
document.onmouseover = highlight; | |
document.onmouseout = unhighlight; | |
} | |
function highlight() { |