diff --git a/base/science-tech-maths/programming/databases/databases.md b/base/science-tech-maths/programming/databases/databases.md index ece06bb..a7d0392 100644 --- a/base/science-tech-maths/programming/databases/databases.md +++ b/base/science-tech-maths/programming/databases/databases.md @@ -40,9 +40,11 @@ psql postgresql://postgres:some_password@postgres_db:5432/my_db_name ### UUID -Use UUIDv7 as primary key: +UUID as primary key: - +- +- +- ### Links diff --git a/base/science-tech-maths/programming/dev-tools/git/git.md b/base/science-tech-maths/programming/dev-tools/git/git.md index 18764a7..04b033f 100644 --- a/base/science-tech-maths/programming/dev-tools/git/git.md +++ b/base/science-tech-maths/programming/dev-tools/git/git.md @@ -21,7 +21,7 @@ Detaching HEAD just means attaching it to a commit instead of a branch: `git che ### Staging Area - helps split changes in several commits -- review changes before commiting +- review changes before committing ## git push @@ -33,6 +33,12 @@ Go to the branch named "main" in my repository, grab all the commits, and then g **The opposite of git-push is not git-pull, it's git-fetch.** +### Push force and push force with lease + +`git push --force` will overwrite the remote branch with your local one. + +`git push --force-with-lease` will block the push if someone else has pushed to the same branch. It's a safer option. + ## Merge `git merge` ***ON TOP OF*** `main`