×
GitFichas is now open-source and undergoing some construction. Thanks for the patience.
You can learn more about the changes happening here.
What is a
conflict
block-beta
columns 1
block:notes
a["it happens when two or more changes are made to the\n same chunk of a file and git doesn't know\nhow to apply the most recent change"]
end
block:notes2
b["conflicts are indicated by the markers >>> === <<<"]
end
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,notes,notes2,notes3,info transparent
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:1.4em;
class a,b,c,notes,notes2,notes3,info textFont
How to create a
Remote
block-beta
columns 1
block:notes
space:2 f["command to create\na new remote"] space i["remote path"]
end
block:command
a("git") b("remote") c("add") d("name") e("url")
end
block:notes2
space g["command to manage\nremotes"] space h["remote name, for\nexample origin"] space
end
%% arrows %%
b --> g
c --> f
d --> h
e --> i
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:2em;
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent
classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em;
class a,b,c,d,e,k commandFont
class f,g,h,i,j,l textFont
What is a
remote
block-beta
columns 1
block:notes
a["is a cloud repository\nfor example on Github or GitLab"]
end
block:notes2
b["every time you clone a repository you have at\nleast one remote - the origin"]
end
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,notes,notes2,notes3,info transparent
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:1.4em;
class a,b,c,notes,notes2,notes3,info textFont
what is a
pull request
block-beta
columns 1
block:notes
a["It is the process of submitting changes for\nreview on GitHub"]
end
block:notes2
b["On GitLab, this process is called merge\nrequest"]
end
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,notes,notes2,notes3,info transparent
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:1.4em;
class a,b,c,notes,notes2,notes3,info textFont
Checking the commits
history
block-beta
columns 1
block:notes
space:1 f["shows an interactive list of commits with\nthe hash and message of each commit"]
end
block:command
a("git") b("log")
end
%% arrows %%
b --> f
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:2em;
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent
classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em;
class a,b,c,d,e,k commandFont
class f,g,h,i,j,l textFont
what is the
staging
area
block-beta
columns 1
block:notes
a["it's the commit setup area"]
end
block:notes2
b["where we see the collection of altered or created files \nthat will be part of the next commit"]
end
%% styling %%
classDef transparent fill:#fff, stroke:#fff;
class a,b,c,notes,notes2,notes3,info transparent
classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#000, line-height:1.4em;
class a,b,c,notes,notes2,notes3,info textFont
