So, this is my situation: I’ve forked this repository which contains dotfile and script for hyprland. I changed some files and now, if I want to sync all the commits made on the original repository to my repository github says “This branch has conflicts that must be resolved”. My question is: can I merge only the commits...
I’m born in 1992 so this game is a bit before my time. I started playing it and got completely hooked. It’s an absolutely fantastic game that would still hold up as a quality indie game today....
I have tried Linux as a DD on and off for years but about a year ago I decided to commit to it no matter the cost. First with Mint, then Ubuntu and a few others sprinkled in briefly. Both are “mainstream” “beginner friendly” distros, right? I don’t want anything too advanced, right?...
I know this post will probably be downvoted to hell, give me much problems and probably will make my account being banned but you have to know that i take no side writing this....