I really wish those video essays were podcasts. The graphics are usually stock or AI generated, or just a talking head. It’s a distraction for me and when trying to skip forward over ads using my earbud, it skips to The next video which is frustrating…
If you don’t know how to resolve conflicts, you should not be using --force or rebase. It can mess your code even more than conflicts.
As for resolving conflicts, it’s pretty straightforward, you have markers in your code for your local changes vs pulled code, just fix it up ro what you think thr code should be. Make sure you resolve all conflicts then stage and commit the changes.
Podcasts.