Mensagens

A mostrar mensagens com a etiqueta rebase

Git Thoughts - Part II - What is rebase?

  Change branch “location” by applying the changes from the commits in another point of the repository tree. How does the process work? The new location for the branch is chosen. The process is done, commit by commit, with the same order they were created. Each commit is applied, starting in the new location and after on the previous commit applied. One commit at a time. If it detects any conflict that cannot be resolved automatically, the process is paused and will need user intervention so it can continue. Until all the commits are successfully applied, all changes are made in a detached Head and the process can be canceled and reverted easily. After applying all the commits and all the eventual conflicts resolved, the head of the branch rebased, now points to the new “last commit”. Every commit has new references so there is now connection between the commits from the original branch and the new one.  There are several variations that can be made controlled by the user, tha...

Git Thoughts - Part I - Merge Branch A to Branch B or Rebase B to top of A

Imagem
I've started a branch, the name is feat A and it was “born” from the main branch. I've started working on my feat A. Meanwhile Jarvas started feat B, also “born” from the main branch. Jarvas finished his changes and created a pull request that was approved. His branch was “closed”: reintegrated on the main branch and the old branch reference deleted.   Option One - Rebase feat A to the top of Main Branch Re-apply commits from feat A on the top of Main Branch. This process is done, commit to commit. Following the order of commits in feat A, each commit is applied to the top of the Main Branch. If it detects any conflict that cannot be resolved automatically, the process is paused and it's necessary the user intervention to solve it and continue the Rebase with the next commit. Fig. 2  Rebase feature branch Option two - Merge from the main branch to feat A Creates new commit on feat A with the new commit refs from Main Branch. This process is done in one step. If Git detect...