Advanced Git Workflows FAQs

Question 1

How can I recover a commit I accidentally deleted?

Accepted Answer

You can use the 'git reflog' command to see a history of all head movements. Once you find the hash of the lost commit, you can use 'git checkout' or 'git branch' to point to that hash and restore your work.

Question 2

What is the benefit of using Git Worktrees?

Accepted Answer

Git Worktrees allow you to have multiple branches checked out at the same time in different directories. This lets you switch to an urgent bugfix without needing to stash your current changes or perform a messy checkout in your main directory.

Question 3

Is it safe to use interactive rebase on public branches?

Accepted Answer

Generally, no. You should only rebase local commits that haven't been shared with others. Rebasing public branches rewrites history and can cause significant conflicts for your collaborators.

Question 4

What does 'git push --force-with-lease' do?

Accepted Answer

It is a safer version of a force push. it ensures you don't overwrite anyone else's work on the remote server by checking if the remote branch has been updated by someone else before allowing the push.

Question 5

When should I use cherry-pick instead of merge?

Accepted Answer

Use cherry-pick when you only want to apply specific changes from one branch to another without bringing in the entire history of that branch, such as porting a single security fix to an older release version.

Advanced Git Workflows

Key Features

Use Cases

Advanced Git Workflows

Key Features

Use Cases