This won't help you resolve the conflicts but it will rollback to the state before invoking `git merge`.
This won't help you resolve the conflicts but it will rollback to the state before invoking `git merge`.
### Git Workflow
There is a variety of of branching strategies and workflows. A well structured workflow promotes organization, efficiency and code quality.
Here we will focus on the **Feature Branch Workflow** which is simple to learn and to use.
In short, developers create separate branches for each feature or bugfix, keeping the ‘main’ branch stable.
When a feature is complete, the developer submits a `pull request` or `merge request` to integrate the changes back into the main branch after a code review.
#### Pull/Merge Request
`Pull request` or `merge request` is usually provided by the collaborating platform such as GitLab and GitHub. A pull request notifies other development team members of changes made in your local repository.
Here is a simple workflow with pull request that you and your team can follow:
