728x90

assume to use child branch, and will want to merge child branch to master.

Show below structure.

 

Local

master

\_ child branch

 

Remote

master

\_child branch

 

We select two options, to merge other to master. 

The First, find top tool bar.

After selecting Merge option, We will see below screen.

 

But this menu confuse to meger something, for tooltip context is very difficult. For Example, "Merge into master" and "git merge master" do not comprehend to merging between master and child branch.

 


The Second, select "Git" icon in bottom area and checkout "master" branch.

Then, select child branch with right click. We will show different option above showing.

 

"Merge child branch into master"

This option is very comprehensive for merging. BTW, Click and Push. It's done.

 

728x90

Given a local / remote branch name, how could I get the hash of the commit that this branch points to?

 

 

The command git rev-parse is your friend, e.g.:

$ git rev-parse development
17f2303133734f4b9a9aacfe52209e04ec11aff4

 

... or for a remote-tracking branch:

$ git rev-parse origin/master
da1ec1472c108f52d4256049fe1f674af69e785d

 

This command is generally very useful, since it can parse any of the ways of specifying branch names in git, such as:

git rev-parse master~3
git rev-parse HEAD@{2.days.ago}

 

+

current branch hash point

~1

~2

~3

 

If we have many of entry, simply point out ~(Want to do before entry point)

728x90

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 개별브랜치

마스터 브랜치의 내용을 개별 브랜치로 Merge하는 방법 내 브랜치에 마스터 브랜치 내용을 업데이트 해봅시다 👩‍💻 1. 터미널 열기 .git 폴더가 있는 디렉토리에서 git bash 열기 디렉토리 확인, g

heestory217.tistory.com

 

728x90

Project could request certificate or validation, for Our project need to be protect from unauthroized user. 

So some of case need for SSL verification.

 

Especailly, protected or private project could do definitely.

 

Information Gathering

35mwl@remoted MINGW64 ~
$ git clone https://remoted@.......
Cloning into 'OtpServer'...
fatal: unable to access 'https://....': SSL certificate problem: unable to get local issuer certificate

 

Setting up

$ git config --global http.sslVerify false

 

Do not confuse other options like

$ git config --global http.security false

 

Then, Cloning start

$ git clone ........
\Cloning into 'OtpServer'...
warning: ----------------- SECURITY WARNING ----------------
warning: | TLS certificate verification has been disabled! |
warning: ---------------------------------------------------
warning: HTTPS connections may not be secure. See https://aka.ms/gcm/tlsverify for more information.
remote: Counting objects: 5889, done
remote: Finding sources: 100% (5889/5889)
remote: Getting sizes: 100% (3431/3431)
remote: Compressing objects: 100% (794/794)
remote: Total 5889 (delta 2082), reused 5883 (delta 2079)
Receiving objects: 100% (5889/5889), 243.03 MiB | 6.96 MiB/s, done.
Resolving deltas: 100% (2082/2082), done.

+ Recent posts