# git指令学习

**Repository Path**: insect001/git-instruction-learning

## Basic Information

- **Project Name**: git指令学习
- **Description**: 多分支开发，合并等操作演练
- **Primary Language**: Unknown
- **License**: Not specified
- **Default Branch**: master
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 0
- **Forks**: 0
- **Created**: 2025-09-22
- **Last Updated**: 2025-09-22

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## README

master 主分支
New Branch from 'master'->dev0
New Branch from 'master'->dev1

三个分支完善代码并直接推送
master push
dev0 push
dev1 push

需求：将 dev0 dev1 功能合并至 master

check out dev0

Merge 'master' into 'dev0'

dev0 push

check out master

Merge 'origin/dev0' into 'master'

master push

Merge 'origin/dev1' into 'master'

本地 master Test.java 文件冲突

reset 到 Merge 'master' into 'master'

master push

check out dev1

Merge 'origin/master' into 'dev1'

本地 master Test.java 文件冲突

master push

check out master

Merge 'origin/dev1' into 'master'

master push