Question

Hey I am new to github so please help me out.

I have four commits.

commit4 eh87eg87

commit3 e3e983jj

commit2 de6d6e3d

commit1 du3qw6y1

I want to go back to commit2 and make changes to it and commit it (commit 5) and not lose the rest of the commits like commit4, commit3, commit2 and commit1.

Answer 1

You can try two things:

1. git rebase --interactive <ID of the commit before commit1>. Read the documentation that git prints for you. Basically, you have to use edit instead of pick for commit1, amend your commit, then continue the rebase.
2. Note down the IDs of the commits, git reset --hard <ID of the commit before commit1>, then take each commit in order and copy them using git cherry-pick <ID of commit>, change the files that you want to change then git commit --ammend, and go to the next one.