مقارنة بيانات تقنية

percent 58.4% التشابه
edit 25 تم العثور على التغييرات
add_circle +116 تمت الإضافة
remove_circle -204 تم الحذف
view_column جنبا إلى جنب view_list عرض مضمن
شارك
Version1 Version2
1 Documentation about Gitlab. 1 Documentation about Gitlab.
2 Documentation about Gitlab. 2 Documentation about Gitlab.
    3 There are two concepts: local repository which is the repository on our local computer, and remote repository which is the repository on a remote sever like gitlab, github and more.
    4 There
    5 are
    6  two concepts: local repository which is the repository on our local computer, and remote repository which is the repository on a remote sever like
    7 gitlab
    8 ,
    9 github
    10  and more.
    11 Git commands:
    12 Git commands:
3 1-Configuration 13 1-Configuration
4 1-Configuration 14 1-Configuration
5 git --version in cmd 15 git –version: to know the version
6 git 16 git –version
7 -- 17 : to know the version
8 version in 18 git status: gives us the status of the file
9   19 git status
10 cmd 20 :
11 git stores files and keep track of any changes, and revert to previous version.    
12 git stores files and keep track of any changes, and revert to previous version.    
13 mkdir name    
14 mkdir    
15      
16 name    
17 cd name    
18 cd name    
19 git status gives us the status of the file    
20 git status    
21 gives us the status of the file 21 gives us the status of the file
22 not a git repository means that we haven’t created the git in the file yet 22 git init: to create git,it’s not connected to any external server it’s just a file.
23 no    
24 t a    
25  git repository means that we haven’t created the git in the file yet    
26 git init to create git and it’s gonna be hidden, it’s not connected to any external server it’s just a file.    
27 git 23 git
28 init 24 init
29  to create git and it’s 25 : to create
30 gonna 26 git,it’s
31  be hidden, it’s not connected to any external server it’s just a file. 27  not connected to any external server it’s just a file.
32 ls to show files 28 git config --global user.name “ ” : to know how made the changes.
33 ls to show files 29 git config --global user.name
34 ls -a to show hidden files 30 “ ”
35 ls -a to show hidden files    
36 git status gives here on branch master means that this is the main branch    
37 git status gives here on branch master means that this is the main branch    
38 git config --global user.name “huda kouli” to know how made the changes.    
39 git config --global user.name “    
40 huda    
41   31  
42 kouli 32 :
43 ” to know how made the changes. 33 to know how made the changes.
44 Git config --global user.email “ “Pic1 34 Git config --global user.email “ ”: to know who made the changes
45 Git config --global 35 Git config --global
46 user.email 36 user.email
47  “ “ 37  “ ”:
48 Pic1 38  to know who made the changes
49 2- commit: snapshot of repository in certain time 39 2- commit: snapshot of repository in certain time
50 2- commit 40 2- commit:
51 :    
52 snapshot of repository in certain time 41 snapshot of repository in certain time
53   42  
54 git commit 43 git add .
55 git 44 g
56 commit 45 it add .
57   46 git commit -m “my first commit” : to add the message.
58 vim readme.md to create text file.( write inside it then press esc to exit edit mode then at the last of file write :x to save. 47 git commit -m “my first commit
59 vim readme.md to create text 48 ”
60 file. 49  :
61 ( 50  to add the message.
62  write inside it then press esc to exit edit mode then at the last of file write :x to save. 51 to unstage changes : git reset HEAD name/ then we do git commit.
63 Untracked file means it is not ready to be added to git,not ready to commit. Pic2    
64 Untracked file means it is not ready to be added to    
65 git,not    
66  ready to commit.    
67      
68 Pic2    
69 Git add readme.md to prepare changes that are about to be committed ( move the file to the staging area) and after commit it’s moved to git repository. Pic3,4,5    
70 Git add readme.md to prepare changes that are about to be committed ( move the file to the staging area) and after commit it’s moved to git repository.    
71 Pic3,4,5    
72 git commit -m “my first commit” -m to add the message. Pic6    
73 git commit -m “my first    
74 commit” -    
75 m to add the message.    
76      
77 Pic6    
78 3- commit multiple files:    
79 3- commit multiple files    
80 :    
81 Pic 607: we have two files one is connected to git and the other one isn’t we do add to move both files to the staging area then we commit what we want    
82 Pic 607:    
83 we have two files one is connected to git and the other one isn’t    
84  we do add to move both files to the staging area then we commit what we want    
85 Pic 609: to unstage changes : git reset HEAD readme.md / then we do git commit.    
86 Pic 609:    
87      
88 to 52 to
89 unstage 53 unstage
90   54  changes :
91 changes : 55 git reset HEAD
92  git reset HEAD readme.md / then we do git commit. 56 name
    57 / then we do git commit.
93 4- git log to see history of what we have done / Git log –patch to give us more information. 58 4- git log to see history of what we have done / Git log –patch to give us more information.
94 4- git log 59 4- git log
95  to see history of what we have done / Git log –patch to give us more information. 60  to see history of what we have done / Git log –patch to give us more information.
96 5-commit folder: git doesn’t track folders so if the folder doesn’t contain a files git won’t recognize it. So we create file using touch command (pic 612). 61 5-deleting file: rm to remove file/ rm -rf – folder_name to remove folder. And we need to do add and commit.
97 5-commit folder 62 5-
98 : 63 deleting file: rm to remove file/
99 git doesn’t track folders so if the folder doesn’t contain a files git won’t recognize it. So we create file using touch command (pic 612) 64 rm -rf –
100 . 65 folder_name
101 6- pic 613-614: deleting file: rm to remove file/ rm -rf – temp to remove folder. And we need to do add and commit. 66  to remove folder. And we need to do add and commit.
102 6- 67 6-ignorefile : vim .gitignore (files inside folder we don’t want to make them part of the repository so we put them in ignore file using )
103   68 6
104 pic 613-614: 69 -
105  deleting file: rm to remove file/ rm -rf – temp to remove folder. And we need to do add and commit. 70 ignorefile
106 7-ignorefile 615/616:files inside folder we don’t want to make them part of the repository so we put them in ignore file using vim .gitignore and we put inside it the name of the file that we want to ignore. 71  :
107 7-ignorefile 72 vim .
108  615/    
109 616:    
110 files    
111  inside folder we don’t want to make them part of the repository so we put them in ignore file using vim .    
112 gitignore 73 gitignore
113  and we put inside it the name of the file that we want to ignore. 74  (
114 617: we notice that config doesn’t appear anymore in the files. 75 files inside folder we don’t want to make them part of the repository so we put them in ignore file using
115 617: 76 )
116   77 7-creating a branch: to keep track of changes and to not affect the main branch.
117 we notice that config doesn’t appear anymore in the files. 78 7
118 8-creating a branch: to keep track of changes and to not affect the main branch. 79 -creating a branch:
119 8-creating a branch:    
120      
121 to keep track of changes and to not affect the main branch. 80 to keep track of changes and to not affect the main branch.
122 Pic 618: Git checkout -b name_of_branch to create the branch, without -b to open a branch 81 git checkout -b name_of_branch to create the branch, without -b to open a branch
123 Pic 618: 82 git checkout -b
124  Git checkout -b    
125 name_of_branch 83 name_of_branch
126  to create the branch, without -b to open a branch 84  to create the branch, without -b to open a branch
127 in this pic we did changes on a file in a branch and it’s not affected the main branch. 85 8-:deleting branch: git branch -d name_of_branch (it will git us error if we haven’t merge it yet) if we want to delete it though we use -D.
128 in this pic we did changes on a file in a branch and it’s not affected the main branch 86 8-
129 . 87 :deleting branch:
130 9- pic 619:deleting branch: git branch -d name_of_branch (it will git us error if we haven’t merge it yet) if we want to delete it though we use -D. 88  
131 9- 89 git branch -d
132 pic 90 name_of_branch
133 619:    
134 deleting    
135  branch:    
136  git branch -d    
137 name    
138 _of_branch    
139  (it will git us error if we haven’t merge it yet) if we want to delete it though we use -D. 91  (it will git us error if we haven’t merge it yet) if we want to delete it though we use -D.
140 10-pic 620:merge branch: we move to the main then we merge the branch by git merge name_of branch 92 9-:merge branch: git merge name_of branch
141 10-pic 620: 93 9-
142 merge branch: 94 :merge branch:
143 we move to the main then we merge the branch by git merge 95 git merge
144 name_of 96 name_of
145  branch 97  branch
146 Fast forward merge: it’s only possible when we haven’t made changes to the master and we merge a branch, otherwise if we made changes to master after creating a branch from it this time of merging won’t work. 98 Fast forward merge: it’s only possible when we haven’t made changes to the master and we merge a branch, otherwise if we made changes to master after creating a branch from it this time of merging won’t work.
147 Fast forward merge 99 Fast forward merge
148 : it’s only possible when we haven’t made changes to the master and we merge a branch, otherwise if we made changes to master after creating a branch from it this time of merging won’t work. 100 : it’s only possible when we haven’t made changes to the master and we merge a branch, otherwise if we made changes to master after creating a branch from it this time of merging won’t work.
149 Pic624-625:show us the branches. 101 Advanced merging: recursive merge it happens when we merge a branch to a master branch after editing master branch.
150 Pic624- 102 Advanced merging
151 625    
152 :show    
153  us the branches.    
154 Pic 626: because we merged the branch so we can delete it.    
155 Pic 626    
156 : because we merged the branch so we can delete it.    
157 Advanced merging: pic 626/627: recursive merge it happens when we merge a branch to a master branch after editing master branch.    
158 Advanced merging:    
159  pic 626/    
160 627:    
161 recursive    
162  merge it happens when we merge a branch to a master branch after editing master branch.    
163 Rebasing commits: pic 632: make changes html file in first branch, then make changes to file in master branch so we can’t do fast forward merging.    
164 Rebasing commits:    
165  pic 6    
166 32    
167 : 103 :
168 make changes html file in first branch, then make changes to file in master branch so we can’t do fast forward merging. 104 recursive merge it happens when we merge a branch to a master branch after editing master branch.
    105 Rebasing commits: git rebase master (If we want to do fast forward merge to keep our history as clean as possible and the changes are not conflicted with each other we will do the rebase which is taking the changes from master adds them to the branch we are in it, then add the commit to this branch.)
    106 Rebasing commits:
    107 git rebase master
    108  (
169 If we want to do fast forward merge to keep our history as clean as possible and the changes are not conflicted with each other we will do the rebase which is taking the changes from master adds them to the branch we are in it, then add the commit to this branch. 109 If we want to do fast forward merge to keep our history as clean as possible and the changes are not conflicted with each other we will do the rebase which is taking the changes from master adds them to the branch we are in it, then add the commit to this branch.
170 If we want to do fast forward merge to keep our history as clean as possible and the changes are not conflicted with each other we will do the rebase which is taking the changes from master adds them to the branch we are in it, then add the commit to this branch 110 )
171 .    
172 Pic 634/635: we see that we rebased the master to the branch then in pic 636 we merged the changes in the branch to the master.    
173 Pic 634/635:    
174 we see that we rebased the master to the branch then in    
175 pic 636    
176  we merged the changes in the branch to the master.    
177 Resolving merge conflicts: conflicts happens when we want to merge two different commits to the same file and the same line. 111 Resolving merge conflicts: conflicts happens when we want to merge two different commits to the same file and the same line.
178 Resolving merge conflicts: 112 Resolving merge conflicts:
179 conflicts happens when we want to merge two different commits to the same file and the same line. 113 conflicts happens when we want to merge two different commits to the same file and the same line.
180 Pic 638-639: we did changes to line/ pic 640/642: we did changes to the same line. 114  git merge – abort( restore master to original content) / same thing for git rebase –abort when doing rebase
181 Pic 638-639:    
182  we did changes to line/    
183 pic 640/64    
184 2    
185 :    
186  we did changes to the same line.    
187 Pic 443: merge conflict to see details about it we use git status.    
188 Pic 443    
189 : merge conflict to see details about it we use git status.    
190 Git merge -- abort to check out to the original branch.    
191 Git merge    
192  --    
193  abort to check out to the original branch    
194 .    
195 Pic 644: git merge -- abort restore master to original content / same thing for git rebase –abort when doing rebase    
196 Pic 644:    
197   115  
198 git merge 116 git merge
199 -- 117 –
200 abort restore master to original content 118  abort
    119 (
    120  restore master to original content
    121 )
201  / 122  /
202 same thing for git rebase –abort when doing rebase 123 same thing for
203 Pic 648: it gives the lines that we conflict in, head means the main branch and it gives the lines in the other branch that we have conflicts in it. 124 git rebase –abort
204 Pic 648: 125  when doing rebase
205  it gives the lines that we    
206 conflict    
207  in, head means the main branch and it gives the lines in the other branch that we have conflicts in it.    
208 To pull changes: git pull origin master. 126 To pull changes: git pull origin master.
209 To pull changes: 127 To pull changes:
210  g 128  
211 it pull origin master 129 git pull origin master.
212 .    
213 To push changes: git push origin master. 130 To push changes: git push origin master.
214 To push changes 131 To push changes
215 : git push origin master. 132 : git push origin master.
216 Pic 654: Handling conflicts: 1) git reset --hard origin/master (we take the changes from the remote repo and deleted the changes from the local repository. 133  Handling conflicts: 1) git reset --hard origin/master (we take the changes from the remote repo and deleted the changes from the local repository.
217 Pic 654: 134  
218  Handling 135 Handling conflicts:
219  conflicts 136  1)
220 : 1) 137 git reset --hard origin/master
221  git reset --hard origin/master (we take the changes from the remote repo and deleted the changes from the local repository. 138  (we take the changes from the remote repo and deleted the changes from the local repository.
222 2)pic 655/656: git pull –rebase. 139 2) git pull –rebase.
223 2) 140 2)
224 pic 655/656 141 git pull –rebase.
225 : git pull –rebase 142 Clone a remote repository: git clone ssh_address (when we did a remote repository and want it locally.)
226 . 143 Clone a remote repository
227 658-659: it rebased the changes in the local repository then in the remote repository, so the push got accepted. 144 :
228 658-659: it rebased the changes in the local repository then in the remote repository, so the push got accepted. 145 git clone
229 Clone a remote repository: when we did a remote repository and want it locally.    
230 Clone a remote repository: when we did a remote repository and want it locally.    
231 Pic 659:Git clone ssh address.    
232 Pic    
233 659    
234 :Git    
235  clone    
236 ssh 146 ssh
237  address. 147 _
    148 address
    149  (
    150 when we did a remote repository and want it locally.
    151 )
238 Merge request: to let others see changes before merging it to main branch. 152 Merge request: to let others see changes before merging it to main branch.
239 Merge request: to let others see changes before merging it to main branch. 153 Merge request: to let others see changes before merging it to main branch.
240 Pic 661/662: creating merge request after push 154 after push a merge request is generated in gitlab.
241 Pic 661/662: creating merge request after push 155 after push
    156 a merge request is generated in
    157 gitlab
    158 .
    159 Every change we push it.
242 Every change we push it 160 Every change we push it
243 Every change we push it 161 .
244 Pic 664:Squash commits adds all the commits into one    
245 Pic    
246 664:Squash    
247  commits adds all the commits into one    
248 Pic 665: fast forward commit Is better to clean history.    
249 Pic 665: fast forward commit Is better to clean history.    
250   162  
251 https://www.youtube.com/watch?v=4lxvVj7wlZw 163 https://www.youtube.com/watch?v=4lxvVj7wlZw

توضح هذه المقارنة الفرق بين نسختين من بيانات تقنية. تحتوي المستندات على تشابه بنسبة 58.4% مع 25 التغييرات التي تم اكتشافها.

لا يتم تخزين بياناتك على الخوادم. تتم جميع المقارنات في جلسة مشفرة ويتم حذفها مباشرة بعد إغلاق علامة التبويب.