codeclubsocial / codeclub_website_dev

CodeClub website source (website no longer hosted)
http://www.codeclub.social
26 stars 7 forks source link

add details about git merge --no-ff my_feature_branch on contribute page #44

Closed holaymolay closed 7 years ago

holaymolay commented 7 years ago

$ git merge --no-ff my_feature_branch

the --no-ff will preserve the network graph on github

instead of merging all the commits onto one line it is recommended that you only use --no-ff when you're merging into dev... it really wont matter when you're merging dev into your feature branch in order to update the feature branch.

This needs to be added to the Contribution page on the site.

craig429 commented 7 years ago

Done. Closing this.