Skip to content

Commit

Permalink
Merge pull request #209 from dev99problems/taking_2nd_section_under_r…
Browse files Browse the repository at this point in the history
…eview

Update migration plan by taking 2-nd section
  • Loading branch information
hedrok authored Nov 21, 2024
2 parents b70ae07 + f855947 commit e930973
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions update-plan/files.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
Конфлікти у файлах:

|===
| Назва файлу |Статус (+ означає зроблено)
| Назва файлу |Статус (+ означає зроблено, * означає в процесі)
| book/01-introduction/sections/about-version-control.asc |
| book/01-introduction/sections/command-line.asc |
| book/01-introduction/sections/first-time-setup.asc |
| book/01-introduction/sections/help.asc |
| book/01-introduction/sections/history.asc |
| book/01-introduction/sections/installing.asc |
| book/01-introduction/sections/what-is-git.asc |
| book/02-git-basics/sections/aliases.asc |
| book/02-git-basics/sections/getting-a-repository.asc |
| book/02-git-basics/sections/recording-changes.asc |
| book/02-git-basics/sections/remotes.asc |
| book/02-git-basics/sections/tagging.asc |
| book/02-git-basics/sections/undoing.asc |
| book/02-git-basics/sections/viewing-history.asc |
| book/02-git-basics/sections/aliases.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/getting-a-repository.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/recording-changes.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/remotes.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/tagging.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/undoing.asc | * by Eugene (dev99problems)
| book/02-git-basics/sections/viewing-history.asc | * by Eugene (dev99problems)
| book/03-git-branching/sections/basic-branching-and-merging.asc |
| book/03-git-branching/sections/branch-management.asc |
| book/03-git-branching/sections/nutshell.asc |
Expand Down
6 changes: 3 additions & 3 deletions update-plan/plan.adoc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
== План оновлення перекладу

Поточний переклад базується на версії `e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec`
(`english-version`) квітня 2016-го року.
Поточний переклад базується на версії https://github.com/progit/progit2/commit/e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec[e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec]
(`english-version`) від 3-го квітня 2016-го року.

Це план, як оновити переклад до версії `2.1.434`.
Це план, як оновити переклад до версії https://github.com/progit/progit2/commit/652208f3f9ba3f31a846cf54b4b1aa682dd72e09[2.1.434] від 4 вересня 2024-го року.

Спробував залити `2.1.434` до `master`, список файлів з конфліктами у `files.adoc`.

Expand Down

0 comments on commit e930973

Please sign in to comment.