Tag: github

[Tips] How To Resize Image In markdown

In markdown documents such as GitHub, there are 2 style of putting image.

![alternate text](url/to/image.jpg"Image Title")

<img src="url/to/image.jpg" alt="alternate text" title="Image Title">

Use the latter style to resize the image as below.

<img src="url/to/image.jpg" alt="alternate text" title="Image Title" width="300" height="200">

Token Authentication For GitHub

GOAL

Today’s goal is to setup for using token-based authentication in GitHub.

Background

In July 2020, we announced our intent to require the use of token-based authentication (for example, a personal access, OAuth, or GitHub App installation token) for all authenticated Git operations. Beginning August 13, 2021, we will no longer accept account passwords when authenticating Git operations on GitHub.com.

from “Token authentication requirements for Git operations”

Refer to “Token authentication requirements for Git operations” in the GitHub blog for more information.

Environment

Windows10
Git 2.19.0
GitHub

Method

See Creating a personal access token.

You can use generated token instead of the password for GitHub in Git Bash or Git GUI.

[Trouble Shooting] error “fatal: refusing to merge unrelated histories” in Git

Problem

When I tried to pull from remote repository, the error “fatal: refusing to merge unrelated histories” occurred. How can I solve it?

$ git pull origin main
warning: no common commits
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/s-nako/ColorSelector
 * branch            main       -> FETCH_HEAD
 * [new branch]      main       -> origin/main
fatal: refusing to merge unrelated histories

Cause

This error occurs because “pull” command is targeted for 2 branches that has same root. In my case, remote main was generated on GItHub and local main was generated in local directory by “git init”.

Solution

Use “–allow-unrelated-histories” option for pull command as below.

$ git pull origin main --allow-unrelated-histories
From https://github.com/s-nako/ColorSelector
 * branch            main       -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

How To Push To The Remote Repository From Local One

This is just a memo. I often forget how to create and connect local repository and remote repository on GitHub.

GOAL

Today’s goal is to summarize how to create remote repository and local repository, and push the committed change from local repository.

Environmet

Windows10
Git 2.19.0
GitHub

Method

1. Create remote repository

Access GitHub and create new repository.

2. Create local repository

Access local directory and create local repository by using command “git init”.

> cd path\wordpressTheme
> git init

.git will be generated.

3. Commit the changes

Add files

> git add *

Commit them

> git commit -m "First commit, The simplest template."

4. Add remote repository

Add the created remote repository by using the command “git remote add <repository_name> URL”. You can copy the URL from the repository page in GitHub.

I named it “origin” conventionally.

> git remote add origin https://github.com/s-nako/wordpressTheme.git

5. Push the changes

Push the local repository to the remote repository. I push the main branch to the remote repository named origin by using “git push” command.

> git push origin main

* The name of the branch “main” is the default name of branch in remote repository in GitHub. The default name was “master” until 2020.10.1.
* You can check the current branch name by using the command “git branch”
* You can change the name of the branch by using the command “git branch -m <before_name> <new_name>” ([Tips]Change the branch name in Git)

Postscript

Generate access token and use it instead of GitHub password. (Token Authentication For GitHub)