Game

learning git branch

Git Merge

• Git Merge
  • Solve conflict
    • Tools
    • Commands

Solve conflict

Tools

In nvim, I use plugin fugitive

Commands

open two vertical buffer (one form target, another from feature)

1

:Gvdiffsplit!

stay on middle and use

1

:diffget [buffername](local)

OR
go to target/feature buffer and use

1

:diffput [buffername](target/feature)

save the local file and use

1
2

:Git add .
:Git commit -m "solve merge conflicts"

• Add remote repository
• Branch

Add remote repository

1

git remote add origin git@github.com:...

origin is the name of the repository
Check remote repository settings:

1

git remote -v

Before push to remote repository, make sure the branch name is the same.

Branch

find all the branch

1

git branch -a

find all the branch on remote repository

1

git remote -r 

Rename

1

git branch -m oldBranchName newBranchName

Move to branch:

1

git checkout [branchname/SHA-1]

What is a Git submodule?

A Git submodule allows a user to include a Git repository as a subdirectory of another Git repository. This can be useful when a project needs to include and use another project. For example, it may be a third-party library or a library developed independently for use in multiple parent projects. With submodules, these libraries can be managed as independent projects while being used in the user’s project. This allows for better organization and management of the code.

How to add a submodule to a project

To add an existing Git repository as a submodule to a project, the git submodule add command can be used. The command format is git submodule add <url> <path>, where <url> is the URL of the submodule repository and <path> is the storage path of the submodule in the project. For example, if a user wants to add the remote repository https://github.com/username/repo.git as a submodule to their project and store it in the my-submodule directory, they can use the following command:

1

git submodule add https://github.com/username/repo.git my-submodule

This will successfully add a submodule named my-submodule to the user’s project.

• check commit history
• change version
• switch to latest
• need a early version of a repository
  • Fork the latest repository on Github
  • clone the forked repository
  • change the version locally and push

check commit history

1
2

git log
git log --pretty=oneline

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

commit 0637340f4d8d288a8d24dd5193855c9e5def776d (HEAD -> main, origin/main, origin/HEAD)
Author: Chen-Yulin <chenyulin@sjtu.edu.cn>
Date:   Tue Mar 21 20:55:16 2023 +0800

    modify obsidian dir

commit dde357abf53f26972bd3ad0e1b1e840412b26fc7
Author: Chen-Yulin <chenyulin@sjtu.edu.cn>
Date:   Tue Mar 21 20:54:57 2023 +0800

    modify obsidian dir

commit 089578f74d206c7fbb503a293d34edf878dad3f3
Author: Chen-Yulin <chenyulin@sjtu.edu.cn>
Date:   Tue Mar 21 20:34:09 2023 +0800

    fix plugin compatibility

commit b62c94796b757851a5e8f38925f28b160a8bf4f0
Author: Chen-Yulin <chenyulin@sjtu.edu.cn>
Date:   Tue Mar 21 14:59:02 2023 +0800

change version

1

git reset --hard [version hash]

switch to latest

1

git pull

or locally

1

git checkout master

need a early version of a repository

Fork the latest repository on Github

clone the forked repository

1

git clone ...

change the version locally and push

1
2
3
4

git log
...
git reset --hard [version hash]
git push --force