Time Nick Message 01:48 MTDiscord Do you (or @luatic or anyone else πŸ˜‰ ) have the time to walk me through the steps? I repeatedly fail to understand github's workflow and always end up recreating all my changes. First I think I need to bring my fork up to date. I just synced in VSCode which brought some changes into my repo - but it's still 14(?) commits behind luanti:master. So I clicked on whatever Github suggested to fix that which leads to " Can’t 01:48 MTDiscord automatically merge. Don’t worry, you can still create the pull request. ". I think this is about a PR from "luanti:master" into mine, but I have no idea how the other change made it into my repo. Sorry for all the confusion. If I'd understand more of this, I might be better in explaining what's going on 😦 01:56 MTDiscord I now create a PR for my own repo and I'm now getting the message: "This branch has conflicts that must be resolved" There's a disabled button "Resolve conflicts" with a tooltip: "You do not have permission to push to the head branch". Maybe my mistake was to not create a separate branch for my changes? 01:57 MTDiscord my best geuess from what your saying assuming you made a branch, sync your master (on github) on your machine, checkout master and pull switch back to your branch git rebase master follow the steps git push -f 01:57 MTDiscord Ok, then the missing branch seems to be the problem here. 01:58 MTDiscord alternatively, make a patch from your current commits, update your master locally, make new branch, apply the patch (i assume you will need to edit some file names) 01:59 MTDiscord πŸ‘† this in theory works, ive only done it like twice ever 02:01 MTDiscord Thanks. I think I'll start all over because my history is now a mess I don't want that to show up in the official repo. But I'm not sure how to link this new attempt with the existing PR where all the discussion happens. 02:01 MTDiscord make a new pr for the new branch, and in the comments, say something like: previous #69420 02:02 MTDiscord Will do, thanks. (I'm just not used to work across multiple repositories) 03:28 MTDiscord Ok, done … I think. I was hoping to learn more from this 2h journey through git(hub), though 😦 03:33 MTDiscord commented 03:36 MTDiscord yay, i didnt fuck it up 03:37 MTDiscord anyways, merging in 10 since it was already approved 03:42 MTDiscord Thanks again! Hopefully the next one is smoother … 03:43 MTDiscord in theory mass moves are done now 03:43 MTDiscord Usually I'm the one causing mass changes 😏 17:30 MTDiscord > I think I'll start all over Think about learning how to use git! πŸ˜‚ 17:31 MTDiscord It's worth the small time investment to be able to fix messed up histories. 18:06 MTDiscord https://xkcd.com/1597/ 18:56 MTDiscord I'be been using git for a couple of years now without bigger headaches. I just don't know how to work with github and multiple repositories. Sure, I still need to learn this, but without a real use case I cannot remember all the steps. 18:58 MTDiscord The only part of that I've needed to remember for any day to day work is that you can specify the name of a remote in pull/push before the branch as a separate argument, and you can refer to local references to remote branch heads by putting a / in front of the branch name.