Skip to main content

🔀 Merge request and code review

Merge request flow​

  • create the braches as mentioned in the branching flow.
  • If there is a short lived user branch, open a merge request from the short lived user branch to the short lived master branch.
  • If there is no short lived user branch, open a merge request from the short lived master branch to the long lived branch.
  • While creating merge request, ensure to enable the delete source branch when merge request is accepted option.
  • Collaborate with your team members and leads to review and approve the changes through merge requests. Add comments, push revisions, and get the merge request approved.
Merge Conflict Resolution
  • If there are any conflicts identified during the review process, Git will notify you.
  • To undo a conflict and start over, you can use the following command:
  git merge --abort
  • To resolve a conflict, you need to clean up the affected file(s) by manually editing them and choosing the desired changes. It may be necessary to communicate with the team member who handled the conflicting branches/features to determine the required modifications.
tip

If you are using Visual Studio Code, you can utilize the Merge Conflict Editor to simplify the conflict resolution process.