Good to know Forking and Rebase concept when dealing with Repository

[Vishal-K-988]

It's a good practice to know how to deal with other github commands if you get stuck somewhere !
For me it was :
#207 (comment)

Here's an high level overview of the issue / mess I have created while working on a PR (#207)

• From the above image it's been clear I have committed my previous 5 commits which is not valid for the fix (Device mode and Toggle and Tracking)
• Also I have created the branch from main branch not from the develop branch !

So in future if you gotta stuck in some situation like this then below is some steps to overcome 😊

[Vishal-K-988]

Discussing some concets :

• rebase
• cherry-pick
• reset
• (knowing commit hash )

[Vishal-K-988]

Always create a new branch if you working on something

Here how you would do it :

• make sure your current head is on develop branch if not then git checkout develop
• Fetch latest changes from upstream
  git fetch upstream
• Create or reset 'develop' branch from upstream
  git checkout -B develop upstream/develop

Create a new branch from here :

• git checkout -b <name of your branch>

[Vishal-K-988]

1. reset ( Not going with the internet description )

• When you want the navigate or Move your branch head to attach to another branch then we use git reset <Name of the destination branch >

Example

Previous

After rebase

[Vishal-K-988]

2. Before reset there would be somethings which you need to keep in mind

• there are 3 flags in reset :
  --soft: Keeps changes staged.

--mixed: Keeps changes in working directory (unstaged).

--hard: Deletes changes permanently.

• need to handle these accordinly

Note :

• If you want that adter reset all the changes should be present when you are doing with the flag --hard
• need to use the feature called cheery-pick

Cherry-Pick

• Understand this like picking up selected commits from your history

• IN the above image you can see that I have cherry-pick commit id 0aa1b1e . THis commit id is from the previous branch

• So after reset all the commits which are below this commit id will come along on my newly reset branch !

[Vishal-K-988]

-force

• In this case I have already created a pr on this branch !

• now to reflect these updated changes need to do a push to the repo !

• but sometimes git restricts this push!

• we need to flag -f in the git push -f <remote repo url variable name> <name of the branch >

Note :

• read all the warning accordinly!

[Vishal-K-988]

Upstream

• you can also use the concept of upstream !