-
Notifications
You must be signed in to change notification settings - Fork 2
/
howtogit.txt.txt.txt
61 lines (41 loc) · 1.8 KB
/
howtogit.txt.txt.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
----
GET STARTED: DO THIS FIRST!
download GIT! http://git-scm.com/download/win
subscribe to the website. top bar from https://github.com/
when registered, open the ugly git bash (command prompt).
type:
$ git config --global user.email ''myname@mail.com''
type:
$ git config --global user.name ''myusername''
now open the nice gui.
get your copy: from the gui set origin the url: https://github.com/stablum/soa
and to set the target, make in the gui a new directory in your pc
then from the gui, RENAME YOUR BRANCH branch name into something different
DO SOME ACTIONS
---
to push (you did something u want to share with us), use the gui:
commit> rescan
with the mouse, click on the files showing under unstaged changes
commit> stage to commit
the same files should go undr the green tab 'staged changes'
click on commit button: add a message like ''random 1st change from myusername''
click on push:
you have shared your first contribution! congratulations!
-
from the git bash (command).
open the folder above where you stored the code.
right click > git bash
type on the command of git: git commit -a -m
---
to pull (you want to get other's work. and you want it fresh all the times!)
git pull origin master
if it crash, something is wrong with the dependencies between the online-master and your branch (personal editable copy) of the code.
check for your random 1st change: you should be able to see it by now.
---
share here your experience with git, stage, commit and push!
-----
to write when committing, 'mymessage' esc:wq
-----
when merge conflict happens, open the code, look for series of minors or majors symbols like >>>>>>>>, and the --------.
choose if you want to keep the HEAD (online version) or the part after the ----- which is your version. then delete the chosen par and save.
commit. then pull.