Code

Conflict remote#1270

Code

Open

yuuichi8314 wants to merge 16 commits intoD-S-Hub:mainD-S-Hub/git-practice:mainfrom yuuichi8314:conflict-remoteyuuichi8314/git-practice:conflict-remoteCopy head branch name to clipboard

+5

Commits

Commits on Oct 10, 2024

• add newfile

  yuuichi8314

  committed
  d1d2ded

Commits on Oct 11, 2024

• change name

  yuuichi8314

  committed
  79c9c13

• change name again

  yuuichi8314

  committed
  d333a1a

Commits on Oct 12, 2024

• make new file

  yuuichi8314

  committed
  6c02321

• delete file

  yuuichi8314

  committed
  273ade8

• new file

  yuuichi8314

  committed
  50e4ff5

• add gitigonre

  yuuichi8314

  committed
  3087d75

Commits on Oct 13, 2024

• update readme

  yuuichi8314

  committed
  d7dfba3

• update readme for automatic merge

  yuuichi8314

  committed
  279e8a0

• make new file forautomaticmerge

  yuuichi8314

  committed
  bbaa7a1

• Merge branch 'no-fast-forward'

  yuuichi8314

  committed
  fca744f

• update readme on conflict branch for conflict

  yuuichi8314

  committed
  f5abed5

• update readme on main for conflict

  yuuichi8314

  committed
  cb47218

• resolve conflict

  yuuichi8314

  committed
  9f141f6

Commits on Oct 15, 2024

• Update README.md

  Show description for d4f2092
  yuuichi8314

  authored
  d4f2092

• update readme on conflict for conflict

  yuuichi8314

  committed
  8ac92df