Git & GitHub: RebasingYouTube↗  IA↗(long shot)
Education  14.3K views 160 likes 3 dislikes   23 Sep 2016
freeCodeCamp.org 11.7M subscribers United States YouTube↗


Please select the problem
You must specify your email and describe the problem in detail
Describe your problem in detail if it's not obvious

Contributed subtitles
English Jackson Bates
Spanish Lucas Lopez
Click to Play Video Click to Play Video
So, we talked about merging but there's another way that you can introduce your
Ya hablamos sobre merging pero hay otra forma en la cual se puede introducir
changes into a branch. That's with 'git rebase'. Now, I do want to have a
cambios a una branch. 'Git Rebase'. Ahora, me gustaría compartir una
disclaimer here: when you use 'git rebase' you are changing history, but that might
advertencia. Cuando usamos 'git rebase' estamos cambiado la historia, pero esto puede
be your preference and might be what your team chooses to do.
ser la preferencia y lo que el equipo seleccione hacer.
Let's talk about the differences. Say we have two branches working here, this is the
Hablemos sobre las diferencias. Consideramos que tenemos dos branches, en el modelo de
'git merge' model and there's A B C and D on one branch and E F on a separate
'git merge', A B C D en una branch, E F en una
branch. Once we merge this branch into the other branch, the way that's going to
branch distinta. Luego de que las unirlas,
appear in history is A B E C F D. So, it's when the changes were made it -
la historia es A B E C F D. Es como los cambios se realizaron.
it's accurate - but you might want your history to be reflective of a different
Es la historia exacta. Pero puede que queramos que la historia refleje una
nature you might want your history to show when those changes were introduced
situación diferente. Puede ser que queramos que la historia muestre como estos cambio fueron introducidos
and make it more linear. That's when you would use 'git rebase'. With rebase in the
y mostrarlos en una forma mas lineal. Es en este caso cuando se puede usar 'git rebase'. Usando rebase, la
same situation instead of merge it will show the commits A B C D E F and their
misma situación en vez del merge, se verían los cambios A B C D E F y su
logical order like I said it's really a matter of preference and what your team
orden lógico. Como dije, depende de nuestra preferencia y la del equipo
chooses to do. So, just be sure to check with your collaborators and make sure
seleccione utilizar. Entonces, compruebe con sus colaboradores y este seguro
you know which one you're expected to be working with.
cual es el modelo se espera con el que trabaje
Similar videos:

Git & GitHub: Most Used Git Commands
freeCodeCamp.org
40.2K views 508 likes 3 dislikes 23 Sep 201697% match

Git & GitHub: GitHub Workflow for Open Source
freeCodeCamp.org
25.3K views 227 likes 6 dislikes 23 Sep 201691% match

Git & GitHub: Branching and the GitHub Workflow
freeCodeCamp.org
35K views 376 likes 3 dislikes 23 Sep 201679% match

Git & GitHub: Introduction to Git & GitHub
freeCodeCamp.org
59.2K views 620 likes 8 dislikes 23 Sep 201672% match



Plan to Update Score
Udacity
32.3K views 9 likes 0 dislikes 08 Jul 201530% match


3 : Scope
Udacity
32.4K views 13 likes 1 dislikes 25 May 201528% match


Planning Your Variables - Solution
Udacity
949 views 4 likes 0 dislikes 08 Jun 201527% match


ASMR Eating GIANT SANDWICHES For 2 HOURS NO TALKING !
nomnomsammieboy
878.2K views 7.2K likes -1 dislikes 21 Nov 201927% match





黒松盆栽 初夏の手入れ 3 葉透かし
【盆栽翠松園】BonsaiSuishoen
2.6K views 79 likes 0 dislikes 02 Aug 202027% match

Bill Gates talks about the Khan Academy at Aspen Ideas Festival 2010
Khan Academy
238.4K views 871 likes 10 dislikes 19 Jul 201027% match


Hoverboard Red Light-How To Calibrate your Hoverboard
KmanAuto
481.9K views 1.8K likes 275 dislikes 29 Feb 201627% match






FRESH INK'S C.A.R.E [420K SUBS SPECIAL - by Jakei]
Jael Peñaloza (Jakei)
2.8M views 137.6K likes -1 dislikes 16 Nov 201927% match



“어린 노무 쉐이가 확!” 박은빈, 누나 카리스마! 차엽을 향해 시전↑ | 스토브리그 | SBS DRAMA
SBS 스브스 Drama
1.7M views 8.8K likes -1 dislikes 11 Jan 202026% match


#128 Travel By Art, Ep. 3: Iron Springs, Washington, USA (Watercolor Landscape Tutorial)
Watercolor Online with Michael Solovyev
4.7K views 936 likes 0 dislikes 22 Feb 202126% match

















[본격 스브스 홈쇼핑!] 민생투어하는 정치인 영상 모음(feat. 패키지 여행) / 스브스뉴스
스브스뉴스 SUBUSUNEWS
141.4K views 1.9K likes 68 dislikes 20 May 201926% match


“예술이다♥” 백종원×김동준, 초간단 우유 카레 맛보고 탄성 발사↗ㅣ맛남의 광장(A Palatial Residence)ㅣSBS ENTER.
SBS Entertainment
5.8K views 51 likes 0 dislikes 09 Jul 202026% match
0 views 0 likes 0 dislikes 05 Jun 202626% match



Configuring ATV61 & ATV71 for 0-10VDC Speed Reference on AI2 | Schneider Electric Support
Schneider Electric
6.4K views 18 likes 7 dislikes 25 May 201726% match

‘절박함 어디 감?’ 백종원, 변해버린 도시락집에 배신감 | 백종원의 골목식당(Back Street) | SBS Enter.
SBS Entertainment
1.7M views 8K likes -1 dislikes 01 Jan 202026% match


¡UN LOTE BEAUTY SI ACTIVAS LA CAMPANITA!!! ((🔔)) | Smarties Reviews
Smarties Reviews
1.7K views 226 likes 4 dislikes 09 Sep 202026% match








Yang Hee-eun's'Morning Dew' sung by singer'Sands' ♬ At the
SBS Entertainment
3.1K views 205 likes 2 dislikes 01 Apr 202026% match


How to Download a YouTube Video 2020 (New Method)
vidIQ
6.7M views 19.1K likes -1 dislikes 29 Mar 201926% match

Subtracting Whole Numbers
Khan Academy
218K views 271 likes 56 dislikes 18 Jul 201126% match





치막집 사장님, 치킨을 포기할 수 없는 이유 “손님들 때문에”ㅣ백종원의 골목식당(Back Street)ㅣSBS ENTER.
SBS Entertainment
583K views 2.2K likes -1 dislikes 08 Apr 202026% match


The Art Assignment - Premiering Early 2014!
The Art Assignment
183.5K views 6.9K likes 55 dislikes 24 Sep 201326% match

Spiderman vs Godzilla w Pink Girlpool, monkey king, Left Shark fun in real life comics SuperHeroKids
SuperHeroKids
16M views 43.7K likes 18.4K dislikes 25 Apr 201625% match





Fix Order Button_1
Udacity
74.3K views 20 likes 0 dislikes 22 May 201525% match


How to Redeem FREE Code and Bluestacks Settings | Warpath Game
TheSignatureReviewer
16.6K views 163 likes 21 dislikes 19 Dec 202025% match


Disbelief Papyrus戦(undertale fangame)　日本語字幕追加
プルトゥpultoo3s
5.2M views 59.4K likes 2.9K dislikes 15 Apr 201725% match

Best Short Motivational Speech Video - 24 HOURS - 1-Minute Motivation #2
Motiversity
3.1M views 65.2K likes 904 dislikes 14 Aug 201625% match




Settings Privacy About Contact Donate