ülesanne 4.1

ülesanne 4.2

Merge conflicts occur when competing changes are made to the same line of a file, or when one person edits a file and another person deletes the same file.

Tip: You can use the conflict editor on GitHub to resolve competing line change merge conflicts between branches that are part of a pull request.

To resolve a merge conflict caused by competing line changes, you must choose which changes to incorporate from the different branches in a new commit. For example, if you and another person both edited the file styleguide.md on the same lines in different branches of the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches.

You can now merge the branches on the command line or push your changes to your remote repository on GitHub and merge your changes in a pull request.

To resolve a merge conflict caused by competing changes to a file, where a person deletes a file in one branch and another person edits the same file, you must choose whether to delete or keep the removed file in a new commit. For example, if you edited a file, such as README.md, and another person removed the same file in another branch in the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches.

ülesanne 4.3

The Missing textures is a black and pink checkered pattern if you don't have Counter Strike: Source mounted into Garry's Mod.

How to fix missing textures issue This guide is to know how to fix the issue that are missing half life 2 textures.

How do I fix this issue? To fix this missing texture issue, you must have to firstly launch up Garry's mod, then after you have got onto your main menu, you then click on Addons. Once you are on the Addons section, you then have to click "Disable all" which should be located on the top left hand side of the Addon screen. Try out the single player, and then spawn the item you are having missing textures with, it should show up the texture.

How to prevent this issue? The main fix for this problem with missing textures is due to too many addons or some addons enabled causing your game to have issues reading the main half life 2 textures. but to use addons within Garry's mod, you must only enable certain amount of addons in order to prevent the issue of the missing textures.

Any other issue? If you do have issue on it showing missing textures after you join a server, make sure to check your options and then multiplayer tab, go to the bottom where it says "When a game server tries to download custom content to your computer" Select the option 'Allow all custom files from Server'. to enable all the missing textures that aren't appearing when you join that server.

ülesanne 5.1

ülesanne 5.2

	Prantsusmaa esitleb oma tuleviku kiirronge

ülesanne 5.3

ülesanne 5.4