Gitのerror(解決したもの)

 

この記事の読者(this article of a reader )

  • gitで悩んでいる人(もしかしたら同じ問題にあっているかも).

※英語とか日本語とかいろいろで書いています。自分のメモをコピペしました。

 

rebaseを取り消し

サイトリンク

http://tobysoft.net/wiki/index.php?git%2Fgit%20rebase%A4%F2%B8%B5%A4%CB%CC%E1%A4%B9%CA%FD%CB%A1

Learning a Git

#作業Aのbranchを作成

1.Git fetch origin

2.git checkout -b work/A origin /master

#作業Bのブランチを作成

Git fetch origin

Git checkout -b work /B

※in this situation , you forgot what is the parent branch

Git でやらかした時に使える

https://qiita.com/muran001/items/dea2bbbaea1260098051

Git 実践サイト

rebaseとmargeの違い

リベースはマージと比べて、もっと単純明快な直線的な履歴になるので、開発履歴がとても読みやすくなるというメリットがあります!

貼り付け元  <https://liginc.co.jp/web/tool/79390>

Git of merge and rebase in detail

gitの履歴の中の一つを確認するとき

Ja, Gi M ¯ O 
NewT 
gist.github.com/naokazuterada/9e45a937f7574ebf91a7 
9 
M 
9 
M 
New T 
9 
M 
New T 
New T 
GitHub Gist Search... 
All gists 
Back to GitHub 
New T 
Star 
naokazuterada / reset_rebase.sh 
Last active 4 days ago • Report abuse 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (solution) 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (solution) 
S git ref log 
c441165 (HEAD -> solution, origin/solution) HEADa{O}: checkout: moving from mast 
er to solution 
13 
P 
o 
Subscribe 
(script src="https ://gist. 
Address 
Fork 
Download ZIP 
Raw 
a6b748d 
c441165 
c441165 
670d21c 
648e130 
fd8996b 
bf4562f 
de4e221 
68b4257 
alcc29e 
cac398e 
a6b748d 
c441165 
(origin 'master, master) HEADa{I}: checkout: moving from solution to mast 
(HEAD 
(HEAD 
HEADa{4} : 
HEADa{5}: 
HEADa{6} : 
HEADa{8} : 
HEADa{10} : 
sol ution , 
solution, 
rebase: 
rebase: 
rebase: 
rebase: 
rebase: 
rebase: 
rebase: 
origin/ solution) HEADa{2}: rebase: updating HEAD 
origin/ solution) HEADa{3}: rebase: aborting 
idid concern to solution3 only i made the shape 
rebase: i finished topic 2019-9-24 9:54 
i finished banner 2019-9-23 
i did this one 2019-09-23 3:12 
i added normalize. css 2019-9-23 
i did this one 2019-09-23 11:44 
i did this one 2019-09-23 11 '00 a.m since css 
i did this one 2019-9-20 
(origin 'master, master) HEADa{12}: rebase: checkout master 
(HEAD -> solution, origin/ solution) HEADa{13}: checkout: moving from mas 
ter to solution 
Write 
Preview 
O 
Leave a comment 
e 
12:54 AM 
2019-11-05

Using site

https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog

From this experience

I learned a lot of things

・commit name is really important

Because you wanna change the history of your branch the more you want to do specific thing

And but you didn’t add the name exactly

And finally, you’re really straggling with finding the commit

To prevent these kinds of situations, you need to do the name exactly.

Git–help

P 
New Tab 
git reflo 
P 
X 9 MyWay 
X Git- git-reflog Dc 
Git undo all chanc 
tree, etc 
X 
New Tab 
MyWay 
Language Tools 
'git reflog• 
Secure Search URL 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
Convert Files 
Opm 
null, 
g rep 
og 
show 
status 
Print lines matching a pattern 
Show convnit logs 
Show various types of objects 
Show the working tree status 
grow, mark and tweak your convnon history 
branch 
checkout 
corm i t 
diff 
merge 
r ebase 
t ag 
col aborate 
fetch 
pull 
push 
List, create, or delete branches 
Switch branches or restore working tree files 
Record changes to the repository 
Show changes between connits, convnit and working 
Join two or more development histories together 
Reapply conunits on top of another base tip 
Create, list, delete or verify a tag object signed with GPG 
(see also: git help workflows) 
Download objects and refs from another repository 
Fetch from and integrate with another repository or a local branch 
Update remote refs along with associated objects 
git help -a' and 'git help -g' list available subcownands and some 
concept guides. See 'git help or 'git help ' 
to read about a specific subcownand or concept. 
Facebook Listen to the Radio 
QuickPDFMerger" 
enhanced by 
Google 
aiga@LAPTOP-2NFV7gog 
/c/xampp/htdocs/practicetaiga2 (master) 
SHOW / HIDE 
o 
O 
e 
Mindsperk Interactive Help 
Address 
I Restore New Tab Page I EULA Privacv 
7:11 PM 
(D) ENG 
2019-11-06

 diff       Show changes between commits, commit and working tree, etc

https://qiita.com/shibukk/items/8c9362a5bd399b9c56be

特定のcommitだけを取り込む

Git cherry pick

After I did git cherry pick -n []

New Tab 
P 
Example by TaigaWatanabe 
sejuku.net/bIog/71544 
'Samurai Blog 
MyWay 
git 
. com> 
. com> 
X 
e Jade 
iti L 
filJ$-z3L 
1. 
1. 
$ git cherry-pick -e [ H! U 
ID] 
MINGWE4/c/xampp/htdocs/practicetaiga2 
commit e55ab16757658049fa6e25c640244e10doc0869c 
Author : 
'Date: 
LAPTOP-2NFV7909\taiga <taiga. similaritiesagmail 
sun Nov 10 21:08:23 2019 +0900 
i added example scss and so on 
commit 5d503bb708e408a4da7d42a2760311d76437be74 
Author : 
Date: 
LAPTOP-2NFV7909\taiga <taiga. similarities@gmail 
sun Nov 10 18:15 2019 +0900 
i 've added picture 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (develop3) 
$ git 
taiga@LAPTOP-2NFV7gog MING"'64 /c/xampp/htdocs/practicetaiga2 (develop3) 
S git cherry-pick -n 8e01faaoe15066823151752e47528bf497b36b15 
error: could not apply 8eOIfaa.. 
i 've done a revisions of concern section 
4>5E2 
2020 
.#Windcws 737— 
+3-1 SE-hä > 
'AiteB+Y-EÄ 
UZiü.66m 
http://www.onamae.com 
r ÖZä.comJ 
o 
ane. 
hint: after resolving the conflicts, mark the corrected paths 
hint: with 'git add or 'git rm 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (develop3) 
S npm start 
Address 
7:28 PM 
2019-11-11

After I did cherry-picjk , some problem was occur

File caused error

Because unexpectation error

・how to reset the update ?

Git checkout .

Also I did a git stash

gitのファイルを削除したい。I want to delete a some file from my local repository

$ git rm FILENAME     

貼り付け元  <https://www-he.scphys.kyoto-u.ac.jp/member/shotakaha/dokuwiki/doku.php?id=toolbox:git:rm:start>

https://www-he.scphys.kyoto-u.ac.jp/member/shotakaha/dokuwiki/doku.php?id=toolbox:git:rm:start

インデントエラー?

インデントエラーが引き起こす問題。

・インデントがありすぎて、localhostが表示されなくなる。また、遅くなる。

また、具体的に起こったわかりにくいエラー

解決策

・グーグルで調べる

taiga.2161ike.coldroom@ya... 
Tv-L 
IDD 
MYPAGE 
MINGWE4/c/xampp/htdocs/practicetaiga2 
New Sect 
Version: webpack 4.40. 2 
Time: 131ms 
Built at: 10/03/2019 5:31:43 PM 
python 
Ass et 
Size Chunks 
Chunk Names 
index. html 574 bytes 
+ 2 hidden assets 
practice f 
Cani t t ed] 
Entrypoint main = 
./css/style. css main.js 
C./src/scss/style. scss] 39 bytes {main} [bui It] 
company 
+ 35 hidden modules 
ERROR in 
html and 
src/scss/components/banner . scss 
9 x Unexpected whitespace at end of 
question 
itespace 
21:30 x Expected single space after " , " 
conma-space-after 
blog 
28:18 x Unexpected missing generic font 
Iy-no-mi ssi ng-generi c-fami Iy-keyword 
blogprog 
Child html -webpack-plugin for "index. html " : 
OneNote 
no-eol -wh 
function- 
font-fami 
b;ogamm 
job chan 
I asset 
Entrypoint undefined = index. html 
I module 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
Git pug questdn section 
Git problem 
o 
line 
in a single-line function 
fami I y 
•O 
Address 
PM 
2019-10-03

Lint error

・  no-eol-whitespace

https://stylelint.io/user-guide/rules/no-eol-whitespace

https://github.com/stylelint/stylelint/issues/1273

・  function-comma-space-after

https://stylelint.io/user-guide/rules/function-comma-space-after

value-list-comma-space-after

https://stylelint.io/user-guide/rules/value-list-comma-space-after

・  font-family-no-missing-generic-family-keyword

https://stylelint.io/user-guide/rules/font-family-no-missing-generic-family-keyword

最終的に、ある程度のエラーは、調べて解決することができました。そのうちの何個かは、解決できなかったです。

Git merge

gitをわかりやすくまとまっているサイト

https://qiita.com/gold-kou/items/7f6a3b46e2781b0dd4a0

e Jade 
111 
X 
e Jade 
x e Jade 
X New Tab 
X 
New Tab 
fro m 
t opic 
banner 
to 
MyWay 
develop 
x 
o 
Topic by TE 
Jade 
Projects 
None yet 
Milestone 
No milestone 
Notifications 
Jade 
github.com/TaigaWatanabe/practicetaiga2/puIl/3 
Topic 
Open 
TaigaWatanabe wants to merge 3 commits into 
i finished topic 2a19-9-24 9:54 
i did topc of revison 2a19-øg-25 9:58 
• I TaigaWatanabe changed the base branch from 
I • I merge branch 'develop' into topic 
20 minutes ago 
b9abbb2 
258afba 
8c5124a 
Customize 
Add more commits by pushing to the topic branch on TaigaWatanabe/practicetaiga2. 
This branch has no conflicts with the base branch 
Merging can be performed automatically. 
Merge pull request 
x Unsubscribe 
You're receiving notifications because 
you're watching this repository. 
I participant 
111 
Lock conversation 
Write 
Preview 
Leave a comment 
You can also open this in GitHub Desktop or view command line instructions. 
Address 
11:31 AM 
x ENG 
2019-10-04
Tv-L 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
. Compiled successfully. 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (banner) 
S git checkout develop 
Compi ling. 
Switched to branch 'develop' 
taiga@LAPTOP-2NFV7gog MINGi€64 /c/xampp/htdocs/practicetaiga2 (develop) 
ru.'drJ : 
Hash: 83a1a1eb2721172a95ba 
Version: webpack 4.40. 2 
Time: 51ms 
Built at: 10/04/2019 11:10:42 AN 
Ass et 
. /css/style. css 
i ndex. html 
ma ln.js 
Entrypoint main = 
Si ze 
153 bytes 
194 bytes 
360 Kia 
Chunks 
mai n Cenitted] 
Cemitt ed] 
mai n Cenitted] 
Chunk Names 
man n 
./css/style. css main.js 
./src/js/index.js] 2 bytes {main} [built] 
/src/scss/style. scss] 39 bytes {main} [bui It] 
+ 34 hidden modules 
Child html -webpack-plugin for "index. html " : 
I asset 
Entrypoint undefined = 
index. html 
b;ogamme 
0b change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:26 AM 
x ENG 
2019-10-04
Tv-L 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
ass-loader/dist/cjs.js!src/scss/style. scss: 
Entrypoint mini-css-extract-plugin = 
C. / node_modu es/css - loader /di st/cj s . j s ! . / node_modu es/sass - loader/di st/cjs. 
s!./src/scss/style. scss] 302 bytes {mini-css-extract-plugin} [bui It] 
+ I hidden module 
r wcIrrJ : 
Compiled successfully. 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (develop) 
'S git pull 
remote: Enumerating objects: 2, done. 
remote: Counting objects: 100% (2/2), done. 
remote: Compressing objects: 100% (2/2), done. 
remote: Total 2 (delta O), reused O (delta O), pack-reused O 
Unpacking objects: 100% (2/2), done. 
From https ://github. com/TaigaWatanabe/practicetaiga2 
3175436.. d8842d5 develop 
1639055.. a6b748d master 
-> origin/develop 
-> origin/master 
There is no tracking information for the current branch. 
,PIease specify which branch you want to merge with. 
See git-pull(l) for details. 
git pull cremote> 
b;ogamme 
0b change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:26 AM 
x ENG 
2019-10-04
taiga.2161ike.coldroom@ya... 
Tv-L 
p 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
There is no tracking information for the current branch. 
Please specify which branch you want to merge with. 
See git-pull(l) for details. 
git pull cremote> 
If you wish to set tracking information for this branch you can do so with: 
git branch develop 
taiga@LAPTOP-2NFV7gog MINGh'64 /c/xampp/htdocs/practicetaiga2 (develop) 
S git branch - develop 
bash: branch: No such file or directory 
taiga@LAPTOP-2NFV7gog MINGh'64 /c/xampp/htdocs/practicetaiga2 (develop) 
S git branch - -set-upstream-to=origin/develop develop 
Branch 'develop' set up to track remote branch 'develop' from 'origin'. 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (develop) 
S git pull 
Compi I i ng. 
updating 3175436. .d8842d5 
OneNote 
Ilow 
ure 
Fast-forward 
b;oganime 
job change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
Address 
11:26 AM 
x ENG 
2019-10-04
Tv-L 
O 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
create mode 100644 src/scss/elements/elements. scss 
create mode 100644 src/scss/generics/normalize. scss 
create mode 100644 src/scss/settings/_base. scss 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (develop) 
S git checkout topic 
Compiling... 
Switched to branch 'topic' 
taiga@LAPTOP-2NFV7gog MINGi€64 /c/xampp/htdocs/practicetaiga2 (topic) 
Hash: 45f12d03673436e73e32 
Version: webpack 4.40. 2 
Time: 71ms 
Built at: 10/04/2019 11:12:22 AN 
Ass et 
. /css/style. css 
i ndex. html 
ma ln.js 
Entrypoint main = 
Si ze 
7.81 Kia 
741 byt es 
360 Kia 
Chunks 
mai n Cenitted] 
Cemitt ed] 
mai n Cenitted] 
Chunk Names 
man n 
./css/style. css main.js 
./src/scss/style. scss] 39 bytes {main} [bui It] 
+ 35 hidden modules 
Child html -webpack-plugin for "index. html " : 
I asset 
Entrypoint undefined = 
index. html 
b;ogamme 
0b change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:27 AM 
x ENG 
2019-10-04
Tv-L 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
./src/scss/style. scss] 8.43 Kia {mini-css 
+ I hidden module 
r wcIrrJ : 
Compiled successfully. 
-extract- 
plugin} L-built] 
taiga@LAPTOP-2NFV7gog MING"'64 /c/xampp/htdocs/practicetaiga2 (topic) 
S git merge 
-no-ff develop topic 
Compiling.. 
Auto-merging src/scss/style. scss 
•CONFLICT (content) : Merge conflict in src/scss/style. scss 
Auto-merging src/index. pug 
CONFLICT (content) : Merge conflict in src/index. pug 
Automatic merge failed; fix conflicts and then convnit the result. 
taiga@LAPTOP-2NFV7gog MINGi€64 /c/xampp/htdocs/practicetaiga2 (topiclMERGING) 
Hash: dOe2bfefaIf325fcfacb 
Version: webpack 4.40. 2 
Time: 99ms 
Built at: 10/04/2019 11:13:47 AN 
Ass et 
Size Chunks 
index. html 2.42 Kia 
362 Kia 
ma ln.js 
man n 
Entrypoint main = 
mal n. J s 
. ,/src/scss/style. scss] 1.19 
Chunk Names 
Cani t t ed] 
Cenitted] mai n 
Kia {main} (built] [failed] 
b;oganime 
job change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
CI error] 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:27 AM 
x ENG 
2019-10-04
Tv-L 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
taigaaLAPTOP-2NFV7gog MINGi•.'64 
S git status 
On branch topic 
You have unmerged paths. 
(fix conflicts and run 
"git 
(use "git merge --abort" 
to 
Changes to be convnitted: 
/ c/xampp/htdocs/pr act i cet ai ga2 
conni t 
abort the merge) 
(topic I MERGING) 
modified : 
modified : 
modified : 
b;ogamme 
0b change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
. stylelintrc 
postcss. config. js 
src/fonts/KozGoPro-Regu ar . otf 
src/fonts/SneI I Roundhand . ttf 
src/fonts/helveti ca_condensed . ttf 
src/fonts/hi rakakupro-w3. otf 
src/fonts/hi rakakupro-w6. otf 
src/fonts/hi rami npro-w6. otf 
src/fonts/seikai -regular . otf 
src/scss/components/banner . scss 
src/scss/el ements/el ements . scss 
src/scss/settings/_base. scss 
webpack . config. js 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:27 AM 
x ENG 
2019-10-04
taiga.2161ike.coldroom@ya... 
Tv-L 
p 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
OneNote 
Ilow 
ure 
taigaaLAPTOP-2NFV7gog 
S git add . 
taigaaLAPTOP-2NFV7gog 
, S git convnit 
:topic 8c5124a] Merge 
taigaaLAPTOP-2NFV7gog 
S git status 
On branch topic 
MINGi•.'64 
MINGi•.'64 
branch 
MINGi•.'64 
/ c/xampp/htdocs/pr act i cet ai ga2 
/ c/xampp/htdocs/pr act i cet ai ga2 
'develop' into topic 
/ c/xampp/htdocs/pr act i cet ai ga2 
(topic I MERGING) 
(topic I MERGING) 
(topi c) 
(topi c) 
nothing to convnit, working tree clean 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
S npm start 
> start 
> webpack-dev-server --mode development --open 
-watch 
. Project is running at http://IocaIhost:8081/ 
: webpack output is served from / 
"'CIS J : Content not from webpack is served from 
. wait until bundle finished: / 
b;ogamme 
0b change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
Address 
11:28 AM 
x ENG 
2019-10-04
Tv-L 
O 
OneNote 
Ilow 
ure 
taiga.2161ike.coldroom@ya... 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
+ Stopped 
npm start 
I Csig] sh 18240! sigpacket : :process: Suppressing signal 18 to Win32 
ss (pid 4428) 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (topic) 
, S git status 
On branch topic 
nothing to convnit, working tree clean 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (topic) 
S git push origin topic 
Enumerating objects: 19, done. 
Counting objects: 100% (19/19), done. 
Delta compression using up to 8 threads. 
Compressing objects: 100% (7/7), done. 
Writing objects: 100% (7/7), 689 bytes 344.00 Ki8/s, done. 
Total 7 (delta 5), reused O (delta O) 
remote: Resolving deltas: 100% (5/5), completed with 5 local objects. 
, To https ://github. com/TaigaWatanabe/practicetaiga2.git 
258afba.. 8c5124a topic -> topic 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (topic) 
proce 
b;oganime 
job change 
predict a future 
psychological strength 
ive in philiplne 
profile 
amazing skill 
GitCpull 
Question 
Why is this important to... 
How much important it is... 
footerO* Etablet X n 
Git rebase —skip 
When git couldn't skip 
.Git merge 
o 
Address 
11:28 AM 
x ENG 
2019-10-04

font-fileを開いてしまったことによるエラー

解決策

Font-fileは、なるべく開かないようにする。

解決のときに参考にしたサイト

https://stackoverflow.com/questions/38004148/another-git-process-seems-to-be-running-in-this-repository

Git checkout rebase  I did the thing

Tv-L 
p 
$1 
MYPAGE v 
meeting 
Illustrator 
set-up 
javascript 
nfra 
IEitatJbtz-6D 
programmer 
Analyzing a web site for.. 
hprovement 
OneNote 
0 
X X Jade 
g' t st"h 
so to 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
,ic/xampp/htdocs/practicetaiga2 (suiuti on) 
Tab 
Git develop branch(ä... 
When you straggle with... 
S git pull 
fatal: unable to access 'https://github. com/TaigaWatanabe/practicetaiga2.git/' : 
Git merge of site 
Git rebase 
'bel ow the picture o 
GitDmaster branch( 
Git indent error so o 
Conflict 
Deve op a branch in 
Could not resolve host: github. com 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
S git checkout develop 
Switched to branch 'develop' 
Your branch is up to date with 'origin/develop'. 
taiga@LAPTOP-2NFV7gog MINGh'64 /c/xampp/htdocs/practicetaiga2 
S git rebase solution dev lop 
fatal: no such branch/ connit 'dev lop' 
taiga@LAPTOP-2NFV7gog MING"'64 /c/xampp/htdocs/practicetaiga2 
S git rebase solution develop 
First, rewinding head to replay your work on top of it... 
Fast-forwarded develop to solution. 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
S git status 
On branch develop 
Your branch is ahead of 'origin/develop' by 14 conunits. 
(use "git push" to publish your local convnits) 
p 
o 
0 
(sol ution) 
(develop) 
(develop) 
(develop) 
Address 
taiga.2161ike.coldroom@ya... 
tj•itj ? Git - Git 3.6 Git 
A g:] (D) ENG 
2019-11-09
taiga.2161ike.coldroom@ya... 
Tv-L 
p 
$1 
MYPAGE v 
meeting 
Illustrator 
set-up 
javascript 
nfra 
IEitatJbtz-6D 
programmer 
Analyzing a web site for... 
hprovement 
Git develop branch(ä... 
When you straggle with... 
OneNote 
0 
X X Jade 
g' t st"h 
so to 
Tab 
git%2 1 
tj•itj ? Git - Git 3.6 Git 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
ex. is ! . /node_modules/sass-loader/dist/cjs. is ! . /src/scss/styie. scss: 
es/css- loader/di st/cj s . j s ! . / node_modu es/postcss- loader/src ! . / node_modu es/sass - 
loader/dist/cjs.js!./src/scss/style.scss 20.9 Kia {mini-css-extract-plugin} [bui 
Git merge of site 
C. / node_modules/css-loader/dist/runtime/api. js] 2. 35 Kia 
lugin} [built] 
Git rebase 
rndmJ : 
Failed to compile. 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
'bel ow the picture o 
S git status 
On branch develop 
GitDmaster branch( 
Git indent error so o 
Conflict 
Deve op a branch in 
Your branch is ahead of 'origin/develop' by 14 conunits. 
(use "git push" to publish your local convnits) 
nothing to convnit, working tree clean 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
S git checkout solution 
Switched to branch 'solution' 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 
S git checkout develop 
Switched to branch 'develop' 
Your branch is ahead of 'origin/ develop' by 14 conunits. 
p 
o 
0 
{mi ni - css-extract-p 
(develop) 
(develop) 
(sol ution) 
Address 
A g:] (D) ENG 
2019-11-09

And after I did a npm start ., the develop branch is updated

Right now , I’m tying to vanish a rebase of data

I did

1.git reflog

2.git rebase -I HEAD ~3

※I need to confime what is the number of head

3.change the pick into the drop

4.esc-shift+z+z

And the commit would be delete

Finally, I’ve sucessed

Tv-L 
p 
UI )rdJL, 
MYPAGE v 
meeting 
Illustrator 
set-up 
javascript 
nfra 
IEitatJbtz-6D 
programmer 
Analyzing a web site for... 
hprovement 
OneNote 
IDD 
2.git rebase -l HEAD 
need to confime what is the number of head 
3.change the pick into drop 
4.esc-shift+z+z 
MI NGWE4/c/xampp/htdocs/practicetaiga2 
taiga.2161ike.coldroom@ya... 
@ Y-Jb 
Git checkout rebase l... 
Figure 36. Merging to in... 
Git rebase -i, git rebase.. 
Git--he p 
Rewritng a git histo 
taiga@LAPTOP-2NFV7gog MING."64 /c/xampp/htdocs/practicetaiga2 (developl REBASE-i) 
bash: q: convnand not found 
In this case 
Leaning a Git 
taigaaLAPTOP 
taigaaLAPTOP 
S git rebase 
taigaaLAPTOP 
What's a meaning of 
S git rebase 
Successful Iy 
Git of rule 
taigaaLAPTOP 
S npm start 
-2NFV7909 MING.•.'64 /c/xampp/htdocs/practicetaiga2 (developl REBASE-i) 
-2NFV7909 MING.•.'64 /c/xampp/htdocs/practicetaiga2 (developl REBASE-i) 
abort 
-2NFV7909 MING.•.'64 /c/xampp/htdocs/practicetaiga2 (develop) 
-i HEAD-7 
rebased and updated refs/ heads/develop. 
-2NFV7909 MING.•.'64 /c/xampp/htdocs/practicetaiga2 (develop) 
> start 
> webpack-dev-server --mode development --open 
-watch 
Git develop branch(- 
When you straggle WI . 
: Project is running at http://localhost:8080/ 
Address 
628 PM 
2019-11-09

Some attention point

I could not have used the command that “git rebase -I HEAD~13”

I could have used “git rebase -I HEAD~7 “

The attention of operation in the sky-blue screen

Before I try to change the pick to drop, I need to do “c common “