| https://stackoverflow.com/questions/74266133/git-unable-to-merge-unrelated-histories-shallow-clone | |
| Never1 use --allow-unrelated-histories. Instead, deepen (or "unshallow") your clone. Edit: as per comments, you also need to convert your clone to a full clone (it's currently a single-branch clone, which I should have anticipated since using --depth during cloning defaults to creating a single-branch clone as well). | |
| Merging, in Git, depends on three commits, not two: | |
| there is your current commit (aka HEAD), which will represent work done since some common starting point; | |
| there is some other commit, which will represent work done in some other branch since the same common starting point; and | |
| there is a third commit, the merge base, which is this common starting point. | |
| When you run git merge, the argument you supply—generally a branch name like feature or master—locates the middle of these three: the "other" or --theirs commit. The current or --ours commit is implied by what you have checked out. The third com |
Sometimes you want to have a subdirectory on the master branch be the root directory of a repository’s gh-pages branch. This is useful for things like sites developed with Yeoman, or if you have a Jekyll site contained in the master branch alongside the rest of your code.
For the sake of this example, let’s pretend the subfolder containing your site is named dist.
Remove the dist directory from the project’s .gitignore file (it’s ignored by default by Yeoman).
| /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ | |
| /* Geohash encoding/decoding and associated functions (c) Chris Veness 2014-2019 / MIT Licence */ | |
| /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ | |
| const base32 = '0123456789bcdefghjkmnpqrstuvwxyz'; // (geohash-specific) Base32 map | |
| /** | |
| * Geohash: Gustavo Niemeyer’s geocoding system. | |
| */ |
| @echo off | |
| setlocal enabledelayedexpansion | |
| setlocal | |
| call :setESC | |
| :: Set the directory and URL pattern | |
| set TARGET_DIR=C:\ProgramData\GOG.com\Galaxy\webcache | |
| set URL_BASE=https://images.gog.com |
Using Fedora 38, say you want to update the package albert from manuelschneid3r, hosted at https://software.opensuse.org/download.html?project=home:manuelschneid3r&package=albert.
And with dnf update, you get the following output:
~ sudo dnf update
Dependencies resolved.
| import { EuiButton, EuiCodeBlock, EuiDataGrid, EuiModal, EuiModalBody, EuiOverlayMask, EuiPanel } from '@elastic/eui'; | |
| import React, { useMemo, useState } from 'react'; | |
| const data = [ | |
| { | |
| '_id': '5e708581cc8113472f705ac0', | |
| 'name': 'Schmidt Hardin', | |
| 'company': 'UPDAT', | |
| 'email': '[email protected]', | |
| 'phone': '+1 (898) 479-2772' |