... | ... | @@ -26,3 +26,5 @@ Thus, a good compromise is the following: |
|
|
|
|
|
- Finally, to close a feature branch and to merge it back into the master, we use `merge`, or `fast-forward merge` if suggested by gitlab. This is the best way to retain a good development history, and will allow to trace bugs and changes.
|
|
|
|
|
|
- During merging to master, squashing the history may be a good alternative in special cases. This should be determined during the "approval" process. Squashing will loose the detailed commit history, but sometimes in special cases this is exactly what is best...
|
|
|
|