Changes

GIT for OOP344 Projects

239 bytes added, 11:37, 30 October 2012

→‎Merge the code back to master repository

=Merge the code back to master repository=

#when ready, merge the branch back to the master branch

## Switch back to master

##: <big><pre>git checkout master</pre></big>

## make sure to pull all changed to your master from the server before merging

## merge

##: <big><pre>git merge IssueNameOrID</pre></big>

#resolve possible conflicts

#test the master repository one last time

#push changes back to github

#close the pull request.

=Pull the new changes to master repositories=

Now all the team members call pull the changes into their master repositories and branch for the next issue

21

edits