First-contributions: Add more content to additional material

[Roshanjossey]

We have an additional material section that has additional content that can be used after the first contribution.
https://github.com/Roshanjossey/first-contributions/blob/master/additional-material/additional-material.md

🐞 Problem
We don't have a lot of content there. We lack content for many problems beginners may face.

🎯 Goal
Have a big FAQ of sorts that can explain processes of doing something to what each git command does

💡 Possible solutions
We'll come up with general problems we wanna address. Spawn issues from this so that people can write content to address that.

📋 Steps to solve the problem

• Comment below about what you'd like to have in additional materials
• I'll add them to the list below
• We'll create an issue for each piece of work
• We'll request for a pull request to address that issue

📋 Content to be added

• [x] How to squash commits
• [x] How to resolve merge conflicts
• [x] Undo local commits
• [x] Remove a file from git without removing from file system
• [x] Edit a commit message
• [x] Revert pushed commits
• [x] Configure username and email for git
• [x] How to move a commit to different branch

[Priyansh2]

@Roshanjossey what about these :-

1. Undo local commits
2. Remove a file from git without removing it from your file system -> If you are not careful during a git add, you may end up adding files that you didn’t want to commit. However, git rm will remove it from both your staging area, as well as your file system, which may not be what you want. In that case make sure you only remove the staged version, and add the file to your .gitignore to avoid making the same mistake a second time.
3. Edit a commit message (how to edit already committed message)
4. Reverting pushed commits
5. Avoid repeated merge conflicts

[vipulgupta2048]

@Roshanjossey I am intermediate in git and I wanted to suggest if we could add some popular website that are beginner friendly. That helped me a lot when I started to learn.
Example - https://try.github.io or https://tiny.cc/noshit . Love this for any commit issues that I face http://sethrobertson.github.io/GitFixUm/fixup.html
We could have a separate section of helpful links for beginners if they get stuck or need more information. I am not promoting anyone here. But I feel this would be helpful. I hope.

[vipulgupta2048]

Okay then I will start working on an additional materials page that provides information in the form of new links which beginners would find helpful.

[wrillrysata]

@Roshanjossey I would like to add a tutorial on how to revert commit and edit already committed message. Is anyone on this already

[Roshanjossey]

@Ijebusoma, we don't have anybody working on this right now. Please go ahead. Also, do add a tutorial for each topic.

[wrillrysata]

@Roshanjossey I submitted a PR #874 for reverting a commit, kindly review. Thanks.

[vipulgupta2048]

PR submitted for Useful Links #900.
Check it out.

[wrillrysata]

Opened a PR #909 for editing commit message

[gunjan01]

@Roshanjossey Hi , I would like to add a tutorial on How to squash commits ,Resolve merge conflicts, Configure username and email for git. Newbie to contributing here, wanting to contribute. Is the issue still open ?

[Roshanjossey]

@gunjan01, all the items in the checklist above were done. I apologise for not updating that checklist.

You can checkout everything we have at the moment here
https://github.com/Roshanjossey/first-contributions/blob/master/additional-material/git_workflow_scenarios/additional-material.md

If you'd like to add anything else, you're more than welcome to do that. For example, you could write a simple write up on git bisect https://robots.thoughtbot.com/git-bisect.

There is one more thing that we can improve to help more users make use of these articles. In the main Readme, the link to this material has the text additional material. I feel like there is room for improvement here.

[gunjan01]

@Roshanjossey Yes, git bisect sounds good. Also, I would try to think what else could we do for the additional material section and get back. If something worthy hits me, will send a PR here.

[akramkazmi71]

Tutorial for Git Stashing added. 6096

[Roshanjossey]

Closing this issue as all items in the checklist is covered.