From e168fd83a6f93d0f7f2d4340a2536a0dcb5ae525 Mon Sep 17 00:00:00 2001 From: Micheal Palliparambil Date: Mon, 10 Mar 2025 22:59:19 -0500 Subject: [PATCH] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b30a716..d3738b3 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ - [Advanced Git Commands](#advanced-git-commands) - [Latest](#latest) - [πŸ“Œ Git Push --Force-With-Lease](#πŸ“Œ-git-push---force-with-lease) - - [Problem](#problem) - - [Solution](#solution) - - [Tutorial](#tutorial) + - [πŸ”Ή Problem](#problem) + - [πŸ”Ή Solution](#solution) + - [πŸ”Ή Tutorial](#tutorial) - [Git Worktree Tutorial](#git-worktree-tutorial) - [πŸ“Œ What is `git worktree`?](#-what-is-git-worktree) - [πŸ”Ή Check Existing Worktrees](#-check-existing-worktrees) @@ -63,13 +63,13 @@ ## πŸ“Œ `git push --force-with-lease` `git push --force-with-lease` ensures you don’t accidentally overwrite someone else’s work when force-pushing. It checks if the remote branch still matches what you last pulled. If someone else has pushed changes in the meantime, your push is rejected, preventing unintended data loss. -### Problem: +###πŸ”Ή Problem: When users are within the same branch and they want to push to remote but not sure if there is a commit pushed from the other dev that might block you -### Solution: +###πŸ”Ή Solution: use the ---force with lease flag while pushing to check it there is a push. If there is a push from the other person - your push to the same branch is cancelled. -### Tutorial: +###πŸ”Ή Tutorial: > Go to detailed tutorial