Skip to content
Snippets Groups Projects
Commit 09ebeec4 authored by Juuso Rytilahti's avatar Juuso Rytilahti
Browse files

Fixed some minor mistakes

parent 1d88ca91
No related branches found
No related tags found
No related merge requests found
......@@ -6,4 +6,4 @@ Up to now, everything we've learned has been through the command line. This appr
* The ability to add several different files by dragging and dropping or selecting from a list
* Adding small snippets, i.e., not taking all the changes that come with the file.
The main issue with graphic tools is that it is nearly impossible to create sensible instructions for them, as their appearance constantly changes. However, let's familiarize ourselves with some basic operations in the Sourcetree interface. If you're using Linux, try a program called GitKraken. Eclipse, IntelliJ, vscode and other development environments probably have a git extension pre-installed or available through an add-on, which allows the use of git within the development environment. Here you can consider your philosophy: do you want to build a massive structure where everything is in one package waiting for the whole package to get tangled, or do you want to use different tools separately? Both solutions have their advantages and generally, git extensions linked to development environments work smoothly and reliably. After all, expandability and integration of different tools is the purpose of an IDE, or Integrated Development Environment.
\ No newline at end of file
The main issue with graphic tools is that it is nearly impossible to create sensible instructions for them, as their appearance constantly changes. However, let's familiarize ourselves with some basic operations in the Sourcetree interface. You can also try program called GitKraken. Eclipse, IntelliJ, vscode and other development environments probably have a git extension pre-installed or available through an add-on, which allows the use of git within the development environment. Here you can consider your philosophy: do you want to build a massive structure where everything is in one package waiting for the whole package to get tangled, or do you want to use different tools separately? Both solutions have their advantages and generally, git extensions linked to development environments work smoothly and reliably. After all, expandability and integration of different tools is the purpose of an IDE, or Integrated Development Environment.
\ No newline at end of file
......@@ -42,19 +42,19 @@ In addition, services operating on the internet typically include other tools as
# Git
,Version control tools come in many different types, but nowadays **git** has displaced most of them, although other tools still have their user base. The first version of Git was developed by Linus Torvalds, who was fed up with the deficiencies of existing tools and needed a better version control system for the development of the Linux kernel.
Version control tools come in many different types, but nowadays **git** has displaced most of them, although other tools still have their user base. The first version of Git was developed by Linus Torvalds, who was fed up with the deficiencies of existing tools and needed a better version control system for the development of the Linux kernel.
## The Basic Idea of Git
Git stores the latest version of the code in a repository, or *repo*. When a change is made to the code, the user can save the changes to their *repo*. There isn't an actual established Finnish translation, at least not one that anyone would use.
Git stores the latest version of the code in a repository, or *repo*. When a change is made to the code, the user can save the changes to their *repo*.
The basic idea of Git is quite clear; the user can return to any old version at any time. If the new features don't work, or the code just doesn't get finished in one evening but it still needs to be used, the user always has access to the old, working version.
Git also allows for branching of development work (Eng. branch). For example, a coder can make changes to their code and gradually develop a new feature. However, the development work can take time and in the middle of it all, it may turn out that the latest release has a programming error that needs to be fixed and published immediately. The current version is completely broken and unfinished, but luckily it's in its own branch. The programmer can return to the main branch, make changes, and publish a new version. The more advanced development of new features is safely stored in its own branch. Thus, new features can be added in parallel no matter how much, so that all team members work on different features. Of course, eventually, the aim would be to get all changes into use, i.e., different development branches are meant to be merged back into the main branch.
Git also allows for branching of development work to multiple different branches. For example, a coder can make changes to their code and gradually develop a new feature. However, the development work can take time and in the middle of it all, it may turn out that the latest release has a programming error that needs to be fixed and published immediately. The current version is completely broken and unfinished, but luckily it's in its own branch. The programmer can return to the main branch, make changes, and publish a new version. The more advanced development of new features is safely stored in its own branch. Thus, new features can be added in parallel no matter how much, so that all team members work on different features. Of course, eventually, the aim would be to get all changes into use, i.e., different development branches are meant to be merged back into the main branch.
## The Stages of Using Git
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment