Git: Rebasado a la Maestra. ¿Ahora que?

Aquí está mi flujo de trabajo de hoy:

🍰 app: $ git branch global-nav-text * master thrills-popUp 🍰 app: $ git checkout thrills-popUp Switched to branch 'thrills-popUp' Your branch is up-to-date with 'origin/thrills-popUp'. 🍰 app: $ git status On branch thrills-popUp Your branch is up-to-date with 'origin/thrills-popUp'. Untracked files: (use "git add <file>..." to include in what will be committed) ngrok simple-cors-http-server.py nothing added to commit but untracked files present (use "git add" to track) 🍰 app: $ git branch global-nav-text master * thrills-popUp 🍰 app: $ git checkout global-nav-text Switched to branch 'global-nav-text' Your branch is up-to-date with 'origin/global-nav-text'. 🍰 app: $ git rebase master Current branch global-nav-text is up to date. 🍰 app: $ git checkout thrills-popUp Switched to branch 'thrills-popUp' Your branch is up-to-date with 'origin/thrills-popUp'. 🍰 app: $ git status On branch thrills-popUp Your branch is up-to-date with 'origin/thrills-popUp'. Untracked files: (use "git add <file>..." to include in what will be committed) ngrok simple-cors-http-server.py nothing added to commit but untracked files present (use "git add" to track) 🍰 app: $ git branch global-nav-text master * thrills-popUp 🍰 app: $ git rebase master Current branch thrills-popUp is up to date. 🍰 app: $ git commit -am "Coda seems to have junked up my code. Specifically JS. The app wasn't pulling in both parks. Turns out that Coda (or something) changed 'append(newRow)' to 'append(ReturnedwRow).' There was an error from Coda after I rebased the global-nav-text branch to master. I updated the JS and all is working well now." [thrills-popUp 737b135] Coda seems to have junked up my code. Specifically JS. The app wasn't pulling in both parks. Turns out that Coda (or something) changed 'append(newRow)' to 'append(ReturnedwRow).' There was an error from Coda after I rebased the global-nav-text branch to master. I updated the JS and all is working well now. 1 file changed, 1 insertion(+), 1 deletion(-) 🍰 app: $ git push --all Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 495 bytes | 0 bytes/s, done. Total 3 (delta 2), reused 0 (delta 0) To https://qfrank@bitbucket.org/uoix/14-03157-front-gate-sales-mat.git bb79a23..737b135 thrills-popUp -> thrills-popUp 🍰 app: $ git status On branch thrills-popUp Your branch is up-to-date with 'origin/thrills-popUp'. Untracked files: (use "git add <file>..." to include in what will be committed) ngrok simple-cors-http-server.py nothing added to commit but untracked files present (use "git add" to track) 🍰 app: $ git push origin master Everything up-to-date 🍰 app: $ git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master'. 🍰 app: $ git checkout thrills-popUp Switched to branch 'thrills-popUp' Your branch is up-to-date with 'origin/thrills-popUp'. 🍰 app: $ git checkout thrills-popUp Already on 'thrills-popUp' Your branch is up-to-date with 'origin/thrills-popUp'. 

Pensé que una vez que rebase eso "fusionaría" mis twigs en master . Estaba equivocado.

Supuse (después de la rebase ) que cuando ejecutara la git branch solo vería el master y ninguna de las twigs.

Esto es lo que tuve:

  o------o------o------o------o------o thrills-popUp / -----o------o------o master \ o------o------o global-nav-text 

Finalmente eliminé 'global-text-nav' (pero todavía está en mi repository remoto).

Mi intención era fusionar todas las twigs en el maestro tanto a nivel local como a distancia.

¿Cómo hago esto sin estropear nada?

He estado leyendo sobre pull , merge , rebase , fetch , etc. Pero me parece un poco confuso.

Esto es lo que estaba tratando de lograr:

  o------o------o------o------o------o thrills-popUp / \ -----o------o-------o-------o-------o-------o------o master \ / o------o------o global-nav-text 

Pero como eliminé "global-nav-text" localmente, estoy de acuerdo con esto:

  o------o------o------o------o------o thrills-popUp / \ -----o-------o-------o-------o------o-------o------o master 

No quiero download el repository remoto y mezclarlo con el local. No quiero causar ningún problema.

Me gustaría simplemente fusionar "limpiamente" mi twig restante, y hacer que mi repository remoto se vea como mi repository local.

Además, veo todas las confirmaciones en mi repository remoto pero ninguno de los nuevos files HTML, CSS y JS que he agregado localmente. Veo los files iniciales que fueron cargados.

Creo que git merge es lo que estás buscando.

Esto debería hacer lo que estás tratando de lograr.

 git pull git fetch origin git checkout master git merge thrills-popUp git merge global-nav-test git push 

Primero searchía el repository remoto para que descargue la twig que eliminó previamente, luego vaya al maestro de twigs y combine los otros dos en el maestro. A continuación, inserte los cambios en el repository remoto.