Skip to content

Commit

Permalink
Update notes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas1312 committed Jul 6, 2024
1 parent e7a9811 commit ec068b4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 4 additions & 2 deletions base/science-tech-maths/programming/databases/databases.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ psql postgresql://postgres:some_password@postgres_db:5432/my_db_name

### UUID

Use UUIDv7 as primary key: <https://www.cybertec-postgresql.com/en/unexpected-downsides-of-uuid-keys-in-postgresql/>
UUID as primary key:

<https://planetscale.com/blog/the-problem-with-using-a-uuid-primary-key-in-mysql#use-an-ordered-uuid-variant>
- <https://www.cybertec-postgresql.com/en/unexpected-downsides-of-uuid-keys-in-postgresql/>
- <https://news.ycombinator.com/item?id=40884878>
- <https://planetscale.com/blog/the-problem-with-using-a-uuid-primary-key-in-mysql#use-an-ordered-uuid-variant>

### Links

Expand Down
8 changes: 7 additions & 1 deletion base/science-tech-maths/programming/dev-tools/git/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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`
Expand Down

0 comments on commit ec068b4

Please sign in to comment.