Twindle: Tutorial For Third Pull Request

[michaelcosj]

How I made my Third PR Using Git CLI

Note that I have already forked the twindle project and cloned it to my local machine and I already have git installed, steps on getting all of this set up have already been discussed on other issues.

• Step 1, Navigate to local twindle project folder
  

• Step 2, Sync fork with the twindle directory
  
  
  

• Step 3, After making desired changes, add it to the staging area so its ready to be commited
  

• Step 4, Check the status and make sure everything is fine
  
  

• Step 5, Commit changes
  

• Step 6, Push changes to github
  
  

• Step 7, Go to the Github page of the fork, and click on pull request or compare changes
  

• Step 8, Click on create pull request
  

• Step 9, Add a title and/or comment and create your pull request
  

Helpful Resources

• Issues #41 and #156
• Git-Guides
• Learn Github in 20 minutes by Colt Steele on YouTube
• Dzone.com - How to resolve github merge conflicts
• GitHub docs - Resolving a merge conflict on github

I hope this was helpful!

[nishanknavelkar]

Screenshots not visible.

[michaelcosj]

All of them?
They work when I try

[nishanknavelkar]

This is what I see,

Maybe Try looking at the preview and see if they are visible there,

[michaelcosj]

Oh!! You have to click on the image links to see it
Because the images are a bit big I didn't want it to take too much space so I hosted them on imgshare.io

[nishanknavelkar]

Oh, ok 👍. See if there is a way where you could downsize the images and upload them so that users need not keep clicking to see the content, It would become a much better tutorial.

[michaelcosj]

I'll look into it now
Thank you!!

[michaelcosj]

I've scaled the images and updated it.
Thanks for the suggestion!

[nishanknavelkar]

looks great 👍

[nishanknavelkar]

@piratelicorne @johnjacobkenny , how can we add this to FAQ and Documentation?

[proful]

Please update your experience with fixing merge conflicts.

That is the objective of this 3rd pr

[johnjacobkenny]

@piratelicorne @johnjacobkenny , how can we add this to FAQ and Documentation?

@piratelicorne @Sheetal777 🙂

[piratelicorne]

Added in the ONBOARDING.md -> #306