Merge branch 'master' into others

Check current branch

35mwl@remoted MINGW64 ~/OtpServer (master)
$ git branch
* master
# current branch was checked with * mark

 

check out current branch to child branch

$ git checkout "child_branch"

 

After checking out, merge master into child_branch to use IntelliJ or command like "git merge master"

"git merge master" means to merge "master" into "child_branch" or others.

With conflicted between master and child, merge will be failed. In this case, recommend to use IDE tools for Debug

 

Quote

https://heestory217.tistory.com/38

Merge branch 'master' into 개별브랜치