adj, 偶然的
occuring, appearing, or done infrequently and irregularly.
the occasional car went by but no taxis.
more:
Occasionally, this process doesn't go smoothly.
n. 決議
a firm decision to do or not to do something.
She kept her resolution not to see Anne any more
the action of solving a problem, dispute, or contentious matter.
the peaceful resolution of all disputes.
more:
Git add standard conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts.
重音在前
v.
focus one's attention or mental effort on a pariticular object or activity.
She couldn't concentrate on the movie.
more:
you can concentrate on your hotfix.
避開, 繞開
There are ways to get ground this.
n. 筒倉
a tower or pit on a farm used to store grain.
n.
an underground chamber in which a guided missile is kept ready for firing.
bleeding --> 流血的
非常前端的技術
the very forefront of technological development.
an architecture that many people delieve is still too bleeding edge fort large mission-critical systems.
more:
The stable branches are farther down the line in your commit history, and the bleeding-edge branches are father up the history.
adj,
more distant in space than another item of the same kind.
the farther side of the mountain
farther down (愈往下), farther up(愈往上)
v. 保留
continue to have (something); keep possession of.
built in 1830, the house retains many of its original features.
more:
If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again.
v. 分離
disengage (something or part of something) and remove it.
he detached the from lamp from its bracket.
more:
You are in 'detached HEAD' state.
adv. 但, 然而
is spite of that; notwithstanding; all the same
statements which, although literally true, are nevertheless misleading.
more:
Nevertheless, a more common way is to take adavantage of remote-tracking branches.
v, 擁抱
hold (someone) closely in one's arms, especially as a sign of affection
Aunt Sophie embraced her warmly.
more:
Many Git developers have a workflow that embraces this approach.
n.
v. 完全放棄
give up completely (a course of action, a practice , or a way of thinking)
he had clearly abandoned all pretense of trying to succeed.
more:
When you rebase stuff, your are abandoning existing commits and creating new ones that similar but different.
v. (會造成傷害的)竄改, 亂動
interface with (something) in order to cause damage or make unauthorized alterations.
someone tampered with the brakes on my car.
more:
it's a historical document, valuable in its own right, and shouldn't be tempared with.
後代子孫
all future generations of people.
n. 衣領
more:
blue collar jobs
n.
a teacher or scholar in a college or institute of higher education.
adj.
of or relating to education and scholarship
這樣, 以這種方式
That way, you can use private branches for work you don't want to share, and push up only the topic branches you want collaborate on.
adv. 向前
further forward in space; in the line of one's forward motion.
he had to give his attention to the road ahead.
adj, 跟上時代的, 現代的
Your branch is up-to-date with 'origin/master'.
拖延
弄清楚, 找出
n. 一連串且立即性的危險
serious and immediate doanger
his family was in peril
n. 極樂
perfect happiness; great joy
she gave a sigh of bliss
總結
more:
Ahh, but the bliss of rebasing isn't without its drawbacks, which can be summed up in a single line:
減輕
make less severe, serious , or painful
reduce, ease
he wanted to mitigate misery in the world.
不同, 獨特的, 和...不同, different, not alike, not the same
adj. recognizably different in nature from something else of a similar type.
the patterns of spoken language are distinct from those of writing.
v. (在一個特定永久的地方)居住
have one's permanent home in a particular place.
people who work in the city actually reside in neighboring towns.
more :
Git has thress states that your files can reside in: committed, modified, and staged.
n. 變異, 變動, 變化
a change or difference in condition, amount, or level, typically with certain limits.
regional variations in house prices.
n. 提示
an act of assisting or encouraging a hesitating speaker.
with barely a prompt, Barbara talked on.
more:
It's also useful to customize your prompt to show information about the current directory's Git repository.
v. 簡略, 刪減(字, 詞, text)
shorten (a word, phrase, or text)
the business of artists and repertory, commonly abbreviated to A&R
more:
If you want to use some abbreviated stats for each commit, you can use the --state option.
v. 弄亂弄糟
make untidy or dirty,
you have mess up my beautiful carpet.
more:
One of common undos takes place when you commit too early and possibly forget to add some files, or you mess up your commit message.
n.
v. 爭論, 爭吵
have a long and complicated dispute.
weeks of political wrangling
more:
The next two sections demonstrate how to wrangle your staging area and working directory changes.
v. 發生, occur, happen,
adj 察覺的, 注意到, 自覺的
having knowledge or perception of a situation of fact.
most people are aware of the dangers of sunbathing.
more:
it will automatically create completion-aware g
bash alias for each of your git aliases.
adj. 臨界的, 危急的, 要緊的
expressing adverse or disapproving comments or judgments.
v. 檢查
look at (someone or something) closely, typically to access their condition or to discover any shortcomings.
they were inspecting my outside paintwork for cracks and flaws.
注意重音在後
v. (從主要道路line) 分叉出去
(of a road, route, or line) seperate from another route, especially a main one, and go in a different direction.
The airport is west of the city beyond the junction where the Glasgow and Fife lines diverge.
more:
Branching means you diverge from the main line of development and continue to do work without messing with the main line.
n. a job or profession
his prime occupation was as editor.
n. 類別
a class or division of people or things regarded as having particular shared characteristics.
five categories of intelligence.
n. 官僚
an official in a government department, in particular one perceived as being concerned with procedural at the expense of people needs.
for a relatively low-level bureaucrat, he maintained remarkable access to the President.