Skip to content

Commit 56d061f

Browse files
Reivew Iuri
1 parent d58f5ac commit 56d061f

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

book/version_control/notebooks.ipynb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@
126126
"\n",
127127
"This is a problem because it becomes impractical to use git to work out the conflicts between files when making new commits in a repository. It requires you to compare the JSON format of those files, which is not as intuitive as rendered notebooks you're probably used too.\n",
128128
"\n",
129+
"Good practice is to clear output before committing notebooks into your git timeline: the source code\n",
130+
"\n",
129131
"There are some tools to ease you in this process, like [Jupytext](https://jupytext.readthedocs.io/en/latest/) and [ReviewNB](https://www.reviewnb.com/), but for now it's best to limit collaboration in ipynb."
130132
]
131133
}

book/version_control/version_control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Try exploring a few files on your computer to confirm wether they are text-based
5656

5757
As you will see in the other chapters on git, when applied to code, version control takes on a very different appearance than what you are used to with traditional backup software, for example, Microsoft Word auto-save, or cloud-based services like OneDrive, Dropbox or even Visual Studio Code Share. All of these platforms are set up in a user-friendly way that is _focused on a single file._ This works fine when we are writing a report like a thesis. However, it does **not** work well when it comes to computer programs, because in addition to the files themselves, the _contents of the file_ become critical. As we will see, git is a version control software that allows us to compare and track changes in every character of text within a file, which is very useful when writing code, as well as working with a distributed team of collaborators.
5858

59-
## git and GitHub
59+
## Git and GitHub
6060

6161
[Git](https://git-scm.com/) is a version control system (VCS), used by a wide variety of engineers and software developers to work on projects in parallel together. It provides multiple benefits such as tracking changes to files, working side by side with other people, and the ability to rollback to previous versions of files without losing track of newer changes. It is a free and open sources software.
6262

0 commit comments

Comments
 (0)