Bug fixes in a feature branch
We're using a A successful Git branching model by Vincent Driessen for our branching model. All's fine but I haven't really seen a particular issue brought up.
From what I've understood, when a new feature is required, you branch of the development and create a new feature branch. You would work on this and when you're done, you would merge this branch into the the development branch.
What if a developer makes a feature and then merges that feature back to development only to be found out that there's some bugs in the feature code. Where should this be fixed? Should a new fix/bugfix branch be started from development and the code be fixed there? I can't see another way.
How should one go about this?
Thanks
Remember that a model is just a model - it's about giving you a structure that makes you more efficient, not blindly following a set of rules. That means that you should feel free to tweak things and figure out what works in your situation, because it may not work in every situation.
I think you have a choice in this situation:
- Roll back the merge and continue work on the feature branch until it is ready
- Start a new branch to fix the bug.
Which one you choose depends on factors like:
- Can your customers see the bug? Make a bugfix or hotfix branch.
- Is the bug really bad and stop other progress on the development branch? Roll back the change.
- Is it only a minor issue with minimal external impact? Simply continue work on the feature branch and merge again when ready.
The difference between a feature branch and bugfix branch isn't important from Git's point of view. It only matters if you use those labels for internal documentation or other auditing purposes (e.g. to keep track of what is visible to external users).
Resist the temptation to work straight off the development branch even if you think the bugfix will be very quick - nothing is ever quite as simple as it seems, and you will give yourself a headache later if anything goes wrong.
Rough visual representation of your choices:
- Support for password authentication was removed on August 13, 2021
- PowerShell script to call git init in all subdirectories
- git clone hangs forever on github
- git status shows fatal: bad object HEAD
- git diff renamed file
- Is a .gitattributes file really necessary for git?
- How to add custom git command to zsh completion?
- Log in to GitHub from the command line with multiple accounts
- Git error - gpg failed to sign data
- How do I prevent 'git diff' from using a pager?
- what to do when you don't want a specific file to be tracked by git
- How to create a git repository in memory?
- Should "git submodule update" or "git submodule init" be executed first?
- With git, how do I remove a local copy of a remote branch? Or at least pull without merging?
- How to push new branch without history
- How can I rename a git worktree
- How do I add a private Git repository as a submodule inside a public Git repository?
- Why does the COMMIT_EDITMSG open when I try to commit in vscode?
- Git Clone - Repository not found
- How to import a zscaler certificate into Git
- Configuring Elastic Beanstalk for SSH access to private git repo using Amazon Linux 2 hooks
- Switched branch without commiting changes, what do I do now?
- git diff showing only commits that revision/branch A is ahead of revision/branch B
- How to install git on a docker ubuntu image?
- What happens to a git submodule when its referenced repo is deleted?
- How do I create a "True merge" from the current HEAD into a previous commit reachable from HEAD?
- Can I run Git commands in Visual Studio?
- git commit and push even although no changes have been made, it's necessary to trigger web hook
- unable to run a function from imported groovy library getting "No such property: git for class: groovy.lang.Binding"
- How can I rename a local Git branch?