Last active
April 19, 2024 21:10
-
-
Save ankitpriyarup/e2056da4a08b12ff7535bffa361c92e1 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Sync with upstream, humne branch pull kara thaa changes maare uspe par kisi aur ne uspar kaam kardiaa toh this command will sync our code with the github server. but humare changes remove kardetaa he ye | |
git remote add upstream /url/to/original/repo.git | |
git fetch upstream | |
git checkout master | |
git reset --hard upstream/master | |
git push origin master --force | |
# Squash 3 commits | |
# Kabhi kabhi hum jab PR daalte he toh review karne waale bolte he ki 2-3 commits ko ekk banaa do for simplicity this command does that | |
git reset --soft HEAD~3 && git commit | |
git push --force | |
# To delete 3 branch starting from head | |
git reset --hard HEAD~3 | |
# To merge branch xyz from master, this will create another commit in xyz branch merging files | |
git checkout xyz | |
git merge master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
/x1000000counsblooketaQ_910262827'Aboldrzopwuex d
![what](https://private-user-images.githubusercontent.com/166779994/324116376-6f9fe355-f7ba-4afb-b1c9-d6088041d5af.jpg?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTkwMTE5NzAsIm5iZiI6MTcxOTAxMTY3MCwicGF0aCI6Ii8xNjY3Nzk5OTQvMzI0MTE2Mzc2LTZmOWZlMzU1LWY3YmEtNGFmYi1iMWM5LWQ2MDg4MDQxZDVhZi5qcGc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNjIxJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDYyMVQyMzE0MzBaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04OTk4OWVmZjY0NmNmNDA5MzZiM2EwZmJlMDFlZmI0ZDg5ZTI4OGJmMmQwZTlkNDU0NzYwMDllNDQ0ZWNhNjFhJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.8uMrmxeWfXnZP2wHc2fITUu0j1Oko0JfqQG9ZLTMW7o)
![i hate you](https://private-user-images.githubusercontent.com/166779994/324116753-803dcf84-f181-4a02-9827-0fae088f5732.jpg?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTkwMTE5NzAsIm5iZiI6MTcxOTAxMTY3MCwicGF0aCI6Ii8xNjY3Nzk5OTQvMzI0MTE2NzUzLTgwM2RjZjg0LWYxODEtNGEwMi05ODI3LTBmYWUwODhmNTczMi5qcGc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNjIxJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDYyMVQyMzE0MzBaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1jZTBlZThkNjEwZWQyMDE1MmFmYjQzMjAyMmEwYjRhY2M4MGJkM2VhODkwM2MxOTY5Y2UyZjY4ZTU0MjFhMDEwJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.C6p4MyWEsn1nf3ECAXy1N_EUKy1qZYgykL2VtYXN09E)
e
![nkojj(https://gist.github.com/assets/166779994/072aa7f2-dc4e-43e7-89f2-4d53f9cfcc39)