DEV Community

Discussion on: I'm a Git Master, Ask Me Anything

Collapse
 
gonedark profile image
Jason McCreary

Depends.

If working on a team, I recommend doing so through a Pull Request. This provides a formal merge process which serves not only as record, but also an opportunity for code review and discussion.

If it's just you, I recommend merging from the command line: git merge the-feature-branch