From 18c1198f2649bf37e8b8d6e471bde4dbfd0f6d89 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 24 Jun 2020 11:23:22 +0200
Subject: [PATCH] [web] Added note on squashing converted lfs files commits.
---
.../devguide/advanced/gitlab-migration.pandoc | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/web/content/docs/devguide/advanced/gitlab-migration.pandoc b/web/content/docs/devguide/advanced/gitlab-migration.pandoc
index c9279fab7b8..d8f2f2c148b 100644
--- a/web/content/docs/devguide/advanced/gitlab-migration.pandoc
+++ b/web/content/docs/devguide/advanced/gitlab-migration.pandoc
@@ -13,22 +13,26 @@ To migrate your repository run the following commands in your local repository (
## Disable Git LFS
-We used Git LFS to store large files but [switched back to plain git](https://github.com/ufz/ogs/issues/2961). You need to disable Git LFS in your repo:
-
-```bash
-git lfs uninstall --local
-```
+We used Git LFS to store large files but [switched back to plain git](https://github.com/ufz/ogs/issues/2961).
::: {.note}
-### <i class="far fa-info-circle"></i> Normalize LFS files in your existing branches
+### <i class="far fa-info-circle"></i> IMPORTANT: Normalize LFS files in your existing branches
If you have branches from pre-GitLab times with e.g. newly created LFS files (benchmark files, images, ...) you have to convert them back to plain git:
```bash
git add --renormalize .
git commit -m "Converted LFS files to plain git."
```
+
+Now you have to squash this conversion commit into your original commit which added the files as Git LFS files. In result your branch history should and **must not** have any Git LFS files! Otherwise GitLab will reject the push!
:::
+When you are done migrating your branches you need to disable Git LFS in your local repo:
+
+```bash
+git lfs uninstall --local
+```
+
## Create a new fork on GitLab
[Create a new fork](https://gitlab.opengeosys.org/ogs/ogs/-/forks/new) from the [official OGS-6 repository](https://gitlab.opengeosys.org/ogs/ogs).
--
GitLab