Trying To Understand/Determine A Basic Git Workflow

by

Your summary is accurate: you can find illustrated in this cheatsheet.

Be aware though that in order to test your feature with the other ones, you have to merge them to develop (git flow feature finish MYFEATURE).
There is another workflow (the Git workflow) which allows for a better feature promotion (to develop, then to release)

The difference is:

  • with git flow:
    • multiple feature branches are merged in devel (where they discover if they can work together or not)
    • then release is created from devel (at which point removing features becomes complex) before being merged back to devel (and master).
  • with gitworkflow:
    • feature branches are merged to a “public” “alpha” branch, which is reset after each release (meaning, deleted/recreated on top of the new release)
    • then a subset of those same feature branches are merged to a “next” (“beta”) branch for integration/acceptance test. That “next” (“beta”) branch is similarly recreated on top of master after each new release.
    • then a sub-subset of feature branches are merged to master, to prepare the next release.

The “public” and “next” (aka ‘devel‘) branches are never merged to master. They are “transient” or “ephemeral”, always deleted/recreated.

Only feature branches are merged to the lifecycle branches (public, next, master).
That means at any time you can chose to drop a feature between one stage of the development lifecycle and the next.

More Related Contents:

  1. Multiple GitHub accounts on the same computer?
  2. How can I delete all Git branches which have been merged?
  3. Git cherry pick and datamodel integrity
  4. Updates were rejected because the remote contains work that you do not have locally
  5. Download single files from GitHub
  6. Git Init in home directory – now unable to commit changes
  7. What’s the best visual merge tool for Git? [closed]
  8. Preferred Github workflow for updating a pull request after code review
  9. git gc –aggressive vs git repack
  10. How to update a pull request from forked repo?
  11. Merge changes from remote github repository to your local repository
  12. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  13. Why is “origin/HEAD” shown when running “git branch -r”?
  14. Git rebase – commit select in fork-point mode
  15. How do you fork your own repository on GitHub?
  16. git diff between cloned and original remote repository
  17. Adding a collaborator to my free GitHub account?
  18. Git branch name – case sensitive or insensitive?
  19. Error “Updates were rejected because the remote contains work that you do not have locally”
  20. How to sync changes on my local server with the ones on the remote one without commiting?
  21. “Cannot spawn ssh” when connecting to Github, but ssh -T [email protected] works?
  22. Push and pull my conda environment using git
  23. Git: Merge a Commit into a different Branch
  24. Git: How to make outer repository and embedded repository work as common/standalone repository?
  25. Git merge squash repeatedly
  26. How to perform a three-way diff in Git without merging?
  27. Clone only the .git directory of a git repo
  28. Why does ‘git commit’ not save my changes?
  29. How does git track source code moved between files?
  30. GitHub pages only showing ReadMe file?

Leave a Comment