Skip to content

Instantly share code, notes, and snippets.

@rafeca
Created June 7, 2019 12:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rafeca/bb0aaf28fa8e0486ad8517d75291a521 to your computer and use it in GitHub Desktop.
Save rafeca/bb0aaf28fa8e0486ad8517d75291a521 to your computer and use it in GitHub Desktop.
$ 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.
# else
$ git merge --abort
$ git merge -Xours 1d9a4cafcf6cc288d675512db8fd984e13aab869
$ script/lint --fix
$ git add .
$ git commit -m "Re-apply prettier formatting"
$ git push <fork http url> pr<PR number>:<name of remote branch>
$ post succesful message to the PR.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment