(RC-2.2.7)$ git commit –a –m “Comment for changes made…”Ĥ. Changes should only contain minor bug fixes and updates to the release documentation. (develop)$ git checkout –b RC-2.2.7 developģ. Create release branch, RC-2.2.7, which is branched from develop. This branch allows the develop branch to receive more updates without affecting that release. They are used to isolate the changes merged in the develop branch and get them ready for a new production release. Release branches are created from the develop branch as well. (develop)$ git push origin -delete myfeature Create a Git release branch Remove feature branch since it has been merged to develop. Stable code is then merged to the develop integration branch. Perform peer code review, unit testing, etc. (myfeature)$ git commit –a –m “Details about changes made…”Ĥ. (develop)$ git checkout –b myfeature developģ.
Create feature branch, myfeature, which is branched from develop. Once developers are done with their changes, this branch is merged back to develop. This branch is created from develop, and it’s used to implement new features. We use those standards daily, and they have been really helpful in US Forest Service projects, like RMRS and CCRC, where we are not the only team/organization performing changes to those websites, and we rarely find ourselves resolving code conflicts caused by our work and/or the work of other teams. This is highly recommended when you collaborate with other teams that are not in your company, or when your team is not always collocated. I recently published an article about Git standards to prevent code conflicts.ĭown below are all the Git commands you need to know to follow those standards.
0 kommentar(er)
