>>52111230To update something:
You just git fetch remotename and then git merge the same branchname again. Usually if you keep a fork or branch around long enough it will start acquiring merge conflicts, which is where an ide like visual studio code can come in really handy because you can look at a nice interface when deciding whether or not to accept changes or edit the code etc and it will also tell you when you try and merge something again and you are already up to date.
If the merge conflict is really severe this is where headaches start arising because you may need to update the code and deciding what version of the code to use and where to combine it is easier if you have some programming knowledge.
protip on github if you look at the files tab of a pull request on github green = lines added and red = lines deleted.
it's usually safe to take their changed lines if your current base codelines are the same as whatever is in the master branch on github and these changes will usually go through automatically, so long as you are keeping your branch ahead of the master. However when you have other pull requests changing the same bit, you may need to take lines from both or actually look and see if other parts of the code have changed.
to avoid ending up with basic mistakes when git merging.
you can run
dotnet clean
and
dotnet test
if any of the test fail, then you might have made a basic mistake
