Skip to content

Instantly share code, notes, and snippets.

View TheBestPessimist's full-sized avatar

TheBestPessimist TheBestPessimist

26 followers · 5 following
  • Looking for work. Hire me!
  • ~/Downloads
  • 11:04 (UTC +03:00)
View GitHub Profile
@TheBestPessimist
TheBestPessimist / Git branching workflow when you have big and interdependent branches.md
Last active January 25, 2023 09:21
Git branching workflow when you have big and interdependent branches

The key for our workflow now is (imo) the following settings in gitlab/repository/settings/Merge Requests:

  • Merge method: Merge commit with semi-linear history.
    You want to use this one because it forces you that before a merge into master, your branch contains the latest master commit. This helps with ordering the commit history in intellij :).
  • Squash commits when merging: Allow
    Some branches dont need to have the history of all the commits, so the branch developer may chose this option in the merge request. It is unchecked by default, but the dev has the option to use it. Use your judgement.
  • Merge commit message template:
Merge branch '%{source_branch}' into '%{target_branch}'
@TheBestPessimist
TheBestPessimist / The Actually Complete Filthy Frank Show
Last active November 3, 2024 06:08
The Actually Complete Filthy Frank Show
magnet:?xt=urn:btih:77bbfb32ee38134bf203a2bf3048e4be882c11a1
@TheBestPessimist
TheBestPessimist / Asus ROG Flow X16 2023 - GV601VI Feedback for Asus
Last active June 25, 2024 10:53
- Sleep doesn't work (when waking up from sleep, the screen doesn't turn on)
- Shutting down doesn't work sometimes. It gets stuck at the "Shutting down" screen for 5+ minutes
- Changing to ECO mode consumes MORE battery than staying in STANDARD. This means OPTIMIZED mode is also broken
- when screen turns off, laptop enters sleep EVEN THOUGH I DISABLED THAT. You are killing my work VPN EVERY GOD DAMN TIME
- Intel video driver is very very outdated (2023-08)
- The dolby application is very slow to start
- Armoury Crate is horrible to use: slow, extremely confusing
- Some keys have ghost presses, so sometimes while typing a character appears twice or trice
- "Rotation Lock" quick-access tile is disabled when i use my laptop normally, and it gets enabled only when i rotate my laptop. Did you ever consider i might not want laptop rotation in some cases, even though it's rotated at 50 dgrees?
- Your "AsusSurvey" app doesn't allow newlines. WTF?!