From bc743b2b457a3aef79c7cf71b828acaea1f7d042 Mon Sep 17 00:00:00 2001
From: Rohit Jadhav <97385473+RohitUJadhav@users.noreply.github.com>
Date: Fri, 9 Aug 2024 23:11:27 +0530
Subject: [PATCH] Raj

---
 cheatsheet.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cheatsheet.txt b/cheatsheet.txt
index 20f35b4..5db9ed9 100644
--- a/cheatsheet.txt
+++ b/cheatsheet.txt
@@ -8,4 +8,6 @@ git status # Just to see
 ssh-keygen -t rsa -b 4096 -C "youremail@example.com"
 tail <path to id_rsa.pub> # Add this key to your GitHub account
 git remote add orign <ssh url.git>
-git push origin master
\ No newline at end of file
+git push origin master
+git log 
+git conflict