Collaboration
steps:
-
create a branch <git checkout -b branch-name>
-
make changes to your code
-
git add . (to add all file changes)
-
git commit -m "message goes here"
-
git pull origin master (to make sure you have the most up to data code)
-
if there are any conflicts then fix the conflicts in your editor 6.2 git add . (to add the changes made on conflicts) 6.3 git commit -m "message of what changed and that conflicts have been corrected" 6.4 git pull origin master (pull again to make sure no changes while working on conflicts)
-
conflicts resolved or no conflicts found - git push origin
-
create pull request from your branch to the master branch
-
If no more conflicts found then merge your pull request