What merging methods to use? #41
EvitanRelta
started this conversation in
General
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Context
So far, the merging method I've used is:
git merge --no-ff [branch]git commit --am, and add an issue-closing line to the merge-commit's body (eg.Fixes #4,Closes #5)Which gives a history that looks like this:
The question
I'm still fairly new in the programming world, so idk what is the industry standard for this.
Fixes #3) on? The merge commit? Or the commits in the branch?If anyone with some experience in this, and knows the pros/cons of each, please advise! D:
All reactions