This will be put up into a Coda document to document how our devops work.
-
Step one is init the git repository.
cd gittest git init
-
Add repository to github
echo "# gitttest" >> README.md git init git add README.md git commit -m "first commit" git branch -M main git remote add origin https://github.com/appliedrelevance/gitttest.git git push -u origin main
-
Next, update the readme file and commit it to local repo.
git commit -a -m "Make more changes to README".
-
Finally, make more updates to the readme file, and commit and push all these changees to the origin repository main branch.
git commit -a -m "final commit to initialize the document" git push -u origin main
That should have created a repository in the github cloud that is synchronized with the local clone of the repository.
Making a change to the existing code starts with deciding which ticket to work on. Each ticket has a number in the project sprint board, whether it is in Jira or Coda. Since we are currently using Coda.io, that's what we will use for this example.
-
If necessary, configure git to merge pulls by default.
git config --global pull.rebase false
-
Pull the master/main changes down to the local version if necessary.
git pull
-
I've made changes and committed in the cloud. What happens now if I try to commit these changes?
Fork from the master repository using the GitHub web interface.
Clone from the forked copy (called "origin" by Git) to local desktop. This will add the source of the fork, called "upstream" to the local clone of the repository.
-
Make changes locally.
-
Create a branch to to save the local changes to.
-
Commit to the local branch.
-
Push to the origin.