Merge branch to master

If there 3 branch named "master" & "fixedBranch"
What you want to do: Merge "fixedBranch" to "master"

1. Under branch master
$ git checkout master

2. Merger
$ git merge fixedBranch

3. Remove branch
$ git branch -d fixedBranch

Change states in Git

How to change the three different states in Git ?

The file used for editing this page
File
REF

Deal with time

1. 目前系統時間(time stamp), 這會根據目前JVM的timeZone有所改

System.currentTimeMillis();

or

new Date().getTime();

2. 相對UTC 時區的offset (輸入的時間是為了要判斷是否為“日光節約”)TimeZone tz = TimeZone.getDefault();long offset = tz.getOffset(new Date().getTime());

REF

3. 根據給予的格式和時區，輸出相對的時間

DateFormat formatter = new SimpleDateFormatter("dd mm yyyy HH:mm:ss");

formatter.setTimeZone(TimeZone.getTimeZone("Europe/Stockholm"));

formatter.format(new Date().getTime());

REF

REF

4. Epoch to time 

https://www.epochconverter.com/