You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/content/contributor-docs/en/contributor_guidelines.mdx
+7-7Lines changed: 7 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,9 +27,9 @@ This is a relatively long and comprehensive document but we will try to signpost
27
27
*[Discussion](#discussion)
28
28
*[Working on p5.js codebase](#working-on-the-p5js-codebase)
29
29
*[Quick Get Started For Developers](#quick-get-started-for-developers)
30
-
*[Using the Github edit functionality](#using-the-github-edit-functionality)
30
+
*[Using the GitHub edit functionality](#using-the-github-edit-functionality)
31
31
*[Forking p5.js and working from your fork](#forking-p5js-and-working-from-your-fork)
32
-
*[Using Github Desktop](#using-github-desktop)
32
+
*[Using GitHub Desktop](#using-github-desktop)
33
33
*[Using the git command line interface](#using-the-git-command-line-interface)
34
34
*[Codebase breakdown](#codebase-breakdown)
35
35
*[Build setup](#build-setup)
@@ -246,7 +246,7 @@ Working from your fork of the p5.js repository is necessary because you will lik
246
246
247
247
### Using GitHub Desktop
248
248
249
-
GitHub Desktop is a program that lets you work with git via a graphical user interface rather than typing commands into a terminal. It is a good option if you are new to git, and you can always switch back and forth between Github Desktop and a terminal whenever you feel like it.
249
+
GitHub Desktop is a program that lets you work with git via a graphical user interface rather than typing commands into a terminal. It is a good option if you are new to git, and you can always switch back and forth between GitHub Desktop and a terminal whenever you feel like it.
250
250
251
251
First, [download and install GitHub Desktop.](https://desktop.github.com/) Once installed, open the application. It will ask you to sign in to your GitHub account. After you have signed in, it will list your projects, including your fork of p5.js. Select your fork, which will be named `yourUsername/p5.js`, and click the blue "Clone" button. It will ask for some details about where to place your project; you can either change them or leave the default settings and continue.
252
252
@@ -410,7 +410,7 @@ From GitHub Desktop, just to the right of the button to change branches in the h
410
410
411
411
Once your code is uploaded, it will show a button prompting you to create a pull request. Clicking the button once will show a preview with another button to actually create the request. Press the "Create Pull Request" button to begin the process.
412
412
413
-

413
+

414
414
415
415
From the terminal, run the following command:
416
416
@@ -422,7 +422,7 @@ Once the push is complete, you may see a link in the terminal that lets you open
422
422
423
423

424
424
425
-
You may also see a button to open a pull request when you visit the p5.js Github repo. Clicking it will also work to open a new pull request.
425
+
You may also see a button to open a pull request when you visit the p5.js GitHub repo. Clicking it will also work to open a new pull request.
426
426
427
427

428
428
@@ -468,7 +468,7 @@ You should now inspect the opened pull request and pay attention to a few things
468
468
469
469
If any of the above is not true (there are more commits than you expected or there are conflicts), you may need to [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing/) or help resolve conflicts. Conflicts here mean that you have made changes to a file that also recently had changes applied to it, and git is not sure which set of changes to keep or leave out. If you are not confident in resolving these issues, let us know and we'll guide you through the process. Basic instruction is as below.
470
470
471
-
Sometimes, Github lets you resolve conflicts directly in the browser by showing you a Resolve Conflicts button:
471
+
Sometimes, GitHub lets you resolve conflicts directly in the browser by showing you a Resolve Conflicts button:
472
472
473
473
Conflicts are shown between `<<<<<<<` and `>>>>>>>`, separated by `=======`. One section shows your code, and the other section shows what has changed in the main branch.
474
474
@@ -482,7 +482,7 @@ When all files with conflicts have been resolved, you can commit your changes.
482
482
483
483

484
484
485
-
Sometimes, the conflicts are too complicated for Github to show on the web. In this case, or if you just prefer the manual method, you can resolve your conflicts locally:
485
+
Sometimes, the conflicts are too complicated for GitHub to show on the web. In this case, or if you just prefer the manual method, you can resolve your conflicts locally:
486
486
487
487
1. Run `git remote add upstream https://github.com/processing/p5.js`
0 commit comments