Code

New feature#1290

Code

Open

nyuki0821 wants to merge 21 commits intoD-S-Hub:mainD-S-Hub/git-practice:mainfrom nyuki0821:new-featurenyuki0821/git-practice:new-featureCopy head branch name to clipboard

+4

Commits

Commits on Dec 28, 2024

• add newfile

  nyuki0821

  committed
  f552582

• change name

  nyuki0821

  committed
  0e14a9f

• change commit again

  nyuki0821

  committed
  449dd6e

• make new file

  nyuki0821

  committed
  afdcac6

• delete file

  nyuki0821

  committed
  6d00289

• make new file

  nyuki0821

  committed
  308da2a

• add gitignore

  nyuki0821

  committed
  fce2fb3

• update readme

  nyuki0821

  committed
  2ac14b7

• update readme for automatic merge

  nyuki0821

  committed
  be3b330

• make new file for automatic merge

  nyuki0821

  committed
  58783be

• update

  nyuki0821

  committed
  5a7bdae

• update readme on conflict branch for conflict

  nyuki0821

  committed
  a26fbc1

• update readme on main branch for conflict

  nyuki0821

  committed
  11ba488

• resolve conflict

  nyuki0821

  committed
  b3f2b17

• Update README.md on github

  nyuki0821

  authored
  e56b33a

• Update README.md on github for conflict2

  nyuki0821

  authored
  e7cd52b

• update readme on conflict-remote for conflict

  nyuki0821

  committed
  6782470

• update for conflict

  nyuki0821

  committed
  52d5343

Commits on Dec 29, 2024

• resolve conflict

  nyuki0821

  committed
  185c8e6

• Merge pull request #1 from nyuki0821/conflict-remote

  Show description for 36d707e
  nyuki0821

  authored
  36d707e

• update readme at my repo

  nyuki0821

  committed
  0add7e2