시간과 공간 그리고 진실의 방

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.

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)

In this case, Project gradle version would not matched correctly for Java project version.

Check Below Process

1.  File - Settings - Build, Execution, Deployment 

Change Build and run using Gradle to intelliJ IDEA

But it is not important things that Gradle will change java version correctly for project settings.

If project used to take in version like 11, change Gradle JVM version to 11.

2. File - Project Settings

Change project SDK version correctly for java project. In this case, need to change corretto-19 to 11. 

3. Change Active profile 

Go Edit  - change active profile what you want to change

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