Categories - Git - wpsze

4 posts in total

Git: solve conflicted files

Git: solve conflicted files What's the simplest way to list conflicted files in Git? 123456# # Search for all conflicting files.git diff --name-only --diff-filter=U --relative# Search for all conflict

2023-05-07

Git

#Github #git commit #git conflicts

Git cherry-pick

Git cherry-pick After switching to the master, use the cherry-pick command to take out the submission of "adding commit instructions", and then add it to the master. 1234567$ git checkout masterSwitch

2023-05-07

Git

#git cherry-pick

Git/Github

Create an empty git repo Git settings will be recorded in the ~/.gitconfig 、~/.config/git/config file under the home page of the user's directory. We need to use the config command to set it. Git 附帶一個

2023-04-27

Git

#Github #git

Git rebase -i

Use rebase -i to merge commits Ref: https://backlog.com/git-tutorial/tw/stepup/stepup7_5.html To merge past commits, use the rebase -i command $ git rebase -i HEAD~~ The default text editor will o

2023-04-26

Git

#git rebase