![](https://lemmy.world/pictrs/image/582d226d-402d-4094-a40c-e6c1e99aa63f.jpeg)
![](https://fry.gs/pictrs/image/c6832070-8625-4688-b9e5-5d519541e092.png)
the stupid thing is I still have my children and I adding our MS accounts after creating the local accounts, because I like setting the parental limits once for all the computers. I just can’t stand the stupid email-based usernames it creates when signing into the MS account during account creation.
You can still merge the whole upstream branch manually with a local clone, and git will stop on each conflict for you to resolve them. Then when it’s done you can push the merged branch to your fork.