diff options
Diffstat (limited to 'src/sledjchisl/NOTES.txt')
-rw-r--r-- | src/sledjchisl/NOTES.txt | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/sledjchisl/NOTES.txt b/src/sledjchisl/NOTES.txt index 9dde016..3a6b0fc 100644 --- a/src/sledjchisl/NOTES.txt +++ b/src/sledjchisl/NOTES.txt | |||
@@ -415,36 +415,6 @@ apt install libmariadbclient-dev libapache2-mod-fcgid libssl1.0-dev uuid-dev spa | |||
415 | 415 | ||
416 | ------------------------------------------------------------------- | 416 | ------------------------------------------------------------------- |
417 | 417 | ||
418 | Merge it into OpenSim-SC. | ||
419 | |||
420 | Complication - I had already added the boxes + early sledjchisl.c to opensim-SC. | ||
421 | I may have to revert that lot, only a few minor commits, which are already part of the main boxes. | ||
422 | d9c772712e27c8e25fab0d17555a9bc11017a125 | ||
423 | d4ea3e50173df1ad646bdb7dc802f5d320b7e511 | ||
424 | 10ed36b3452ce6373175112716b043047dc896a9 | ||
425 | 2f66c46e7ce18d60cd1f565880fb7762b3399ccb | ||
426 | 34c5ee4c2a489a506e93d5b303fbc80b263747f0 is the commit that added it. | ||
427 | f9bfa831d1ccaa973c42042584510e1a724ddaef the one before it. | ||
428 | It's been pushed up to the sledjhamr.org repo. | ||
429 | |||
430 | git revert d9c772712e27c8e25fab0d17555a9bc11017a125 d4ea3e50173df1ad646bdb7dc802f5d320b7e511 10ed36b3452ce6373175112716b043047dc896a9 2f66c46e7ce18d60cd1f565880fb7762b3399ccb 34c5ee4c2a489a506e93d5b303fbc80b263747f0 | ||
431 | git remote add -f boxes ~/MyLinux_3/TOYBOX/sledjchisl | ||
432 | git merge --allow-unrelated-histories boxes/master | ||
433 | git remote rm boxes | ||
434 | |||
435 | |||
436 | https://medium.com/altcampus/how-to-merge-two-or-multiple-git-repositories-into-one-9f8a5209913f | ||
437 | https://medium.com/@checko/merging-two-git-repositories-into-one-preserving-the-git-history-4e20d3fafa4e | ||
438 | https://thoughts.t37.net/merging-2-different-git-repositories-without-losing-your-history-de7a06bba804 | ||
439 | https://blog.doismellburning.co.uk/merging-two-git-repositories/ | ||
440 | |||
441 | Other much more complicated variations. | ||
442 | |||
443 | http://mbork.pl/2019-08-19_Transplanting_a_directory_to_another_Git_repository | ||
444 | |||
445 | |||
446 | ------------------------------------------------------------------- | ||
447 | |||
448 | Install / update / upgrade. | 418 | Install / update / upgrade. |
449 | 419 | ||
450 | I could keep the version number around. | 420 | I could keep the version number around. |