Branches and Merges

branches_n_merges.md

Before merge

*      A2
|  
|  *   B2
|  |  
|  *   B1
|  |
*  |   A1
| /
|/
|
*      Base (develop)

Merge as it is

Current Doppler approach (when no conflicts)

|
*         Merge B in develop
|\
| \
*  \      Merge A in develop
|\  \
| \  \ 
|  *  |   A2
|  |  |
|  |  *   B2
|  |  |  
|  |  *   B1
|  |  |
|  *  |   A1
|  | /
|  |/
|  /
| /
|/
|
*      Base (develop)

Merge as it is with backward merge

Old Doppler approach (when there are conflicts)

|
*         Merge B in develop
|\
| \
|  \
|   \
|    \
|     *   Merge develop in B
|    /|
|   / |
|  /  |
| /   |
|/    |
*     |   Merge A in develop
|\    |
| \   | 
|  *  |   A2
|  |  |
|  |  *   B2
|  |  |  
|  |  *   B1
|  |  |
|  *  |   A1
|  | /
|  |/
|  /
| /
|/
|
*      Base (develop)

Rebase and merge commit

Relay / Doppler when there are conflicts

|
*      Merge B in develop
|\
| \
|  *   commit B2'
|  |
|  *   commit B1'
| /
|/
*      Merge A in develop
|\
| \
|  *   commit A2
|  |
|  *   commit A1
| /
|/
*      Base (develop)
|

Rebase without merge commit

Forms Editor

|
*   commit B2'
|
*   commit B1'
|
*   commit A2'
|
*   commit A1'
|
*   Base (develop)
|

Rebase & Squash

Making Sense standard

|
*   Squash de B1 y B2
|
*   Squash de A1 y A2
|
*   Base (develop)
|

See MakingSense's Development Guidelines

Commits as progressive code improvement and not development history

• 👍 Atomic commits
• 👎 WIP commits
• 👎 PR with commits for fixes (exceptions, alternatives)
• 👎 Commits reverting previous code in the same PR
• ⚒ Interactive rebase
• ⚒ fixup! commit
• ⚒ Reset mixed
• ⚒ Start a new branch, stealing code and ideas from the old one

Comparison

• Merge as it is (with with backward merge if necessary)
  • 👍 Long living branches, see Why you should stop using rebase, Stop cherry-picking
  • 👎 Short feature branches
  • 👎 Not clear history, difficulties to revert a merge
  • 👎 Merge responsibility diluted
  • 👎 Local tests could not include remote changes
• Rebase and merge commit
  • 👍 PRs clearly visible
  • 👍 Independent commits clearly visible
  • 👎 Redundant information
  • 👎 Atomic PRs
  • 👍 Not so atomic PRs with meaninful commits
• Rebase without merge commit
  • 👍 Very clear history
  • 👎 PRs not visible easily
  • 👍 Atomic PRs
  • 👍 Not so atomic PRs with meaninful commits
• Rebase & Squash
  • 👍 Very clear history
  • 👍 PRs not visible easily
  • 👍 Atomic PRs
  • 👎 Not so atomic PRs with meaninful commits