-
Notifications
You must be signed in to change notification settings - Fork 2
Meeting Notes
Camila Vargas Poulsen edited this page Oct 31, 2022
·
10 revisions
Attendance: Angel, Althea, Halina, Juliette, Sam
- Merge conflict: Git does not know which change to preserve. When two people change the same part of the same file.
git checkout-
git fetch- opposite than a push, softer than a pull - pull = fetch + merge
- Do a pull after doing a fetch
- merge commit, merging branches
-
git log- to see all the commits in a branch -
git log --graph --all--> displays all the branches to -
git merge[name-of-branch] --> mergest two branches - Best practice: Keep a linear history as much as possible
-
rebase- takes you back to a linear history. Copy -paste the commits ahead of one branch to another branch. -
rebase- makes new commits with the same changes you made in a certain branch. Copy and paste, but the pasting are "new commits" - To
rebasecommits you've made on branch A intomain, you have togit checkout Aand thengit rebase main - Git resources explaining "rebasing" to a new branch
-
git fetch--> lets you see changes before merging -
git rebase --abort--> undo the rebase -
git diff main..origin/main--> comparing changes in two branches - you can also
git merge --abort - Using "graph" help understand where changes are happening
Attendance: Nick, Angel, Haley, Althea, Camila
- Chatted about building packages in R
- Great resource: https://r-pkgs.org/
- Start using our meetings to get things done on our website. But of course, if a cool topic comes up, we can go with the flow.
- Next week: figure out our landing page
- Camila will write some text. Feel free to edit and re-write if needed.
- The goal would be to have a nice formatted landing page
- Other things to do: Write a data recipe about decisions we made when creating a collaborative website. Reorganize "Our Team"? and add font-awesome to each description.
Attendance: Haley, Angel, Nick, Daphne, Camila
- We pull-request and merge branches!
- After a couple of tries, we were able to merge the our-team branch into main by submitting a pull-request
- We also modified the yml to make sure the different sections of our website are reflected on the top bar
- We created qmd files for data-bytes and data-recipes
- This to remember:
- Always render before pushing changes. This way, all files in the /doc folder are updated.
- Because the main branch is protected, we can't push any changes directly to main. Always work from a branch and then pull-request.
- Explore GitHub Projects to manage our tasks
Attendance: Daphne, Haley, Nick, Camila
- We learn about the command
quarto preview--> let you preview the website live in the window of your browser. You have to press the stop button on the terminal to end the preview. - We installed font awesome to add cool icons easily.
- Here some documentation about Font Awesome Extension for Quarto and how to install it.
- Create a section for Data recipe - here is how we do this... eg website
- Create a section for "data bites" - short descriptions/ snippets of fun cool things (eg: git command, how to set a cash token for different token time)
- What do we want our landing page to be? Description about our team and what we do here?
- Merch branches!
Attendance: Angel, Althea, Haley, Nick, and Camila
- Collaboration: Make a branch per task/feature where we all collaborate. To avoid merge conflict we communicate through Slack when someone has pushed changes. Make sure always to pull first!
- We protected the main branch. We set the rule that at least 1 person has to approve the pull request before merging to main.
- Delete our test branches
- Camila will create a branch to update the Our Team page
- We all write our bios and push changes to this branch. Make sure to communicate via Slack when you are making changes.
- Add a sentence about what you want to achieve with this website project.
Attendance: Angel, Althea, Haley, Sam, and Camila
- We discussed collaborating using branches.
- We all agree that following Matt's advice and metacatui/CONTRIBUTING.md, we are going to use branches for each feature we add to the website.
- This means, for example, if Haley is going to work on the theme and aesthetics of the website, she will create a new branch named something like epperly_theme. She would then present what she did to the group, and we would merge her changes to the main branch through a pull request.
- We will use protected branches, so everyone has to approve pull requests to main.
- main is the branch that is going to be deployed.
- We then started playing around to understand how branches work. We created personal branches from the command line and push them.
- The idea was that each of us got to create a new branch named lastname_test and then push that local branch to the remote.
- See issue #7 for more details on this exercise and some git commands we played around with.
- Send out a poll to see if people want to meet next week. Some of us can't make it
- Divide in conquer to see who wants to take ownership of what tasks - Them and the overall look of the website - Create the different pages and describe what will go on them - Write our collaboration/contribution protocol in the README of the repo
- Define how we want to present ourselves
Attendance: Angel, Haley, Daphne, Camila
- Recap of how we created the website
- Changed organization name to Data Coding Club
- Changed repo name to match organization name -- website URL has been updated
- Decided to use branches for collaborating and then using pull requests to merge into main and publishing
- Camila with draft the collaboration protocol on the README of this repository
- Next week, we will each create our own branch to start "collaborating"
- The first contribution can be our personal description
- Brainstorm a fun structure for our descriptions
Attendance: Althea, Sam, Daphne, Nick, Camila
- We live code to build our website!
- Sam’s resource for MEDS
- Creating a protocol for contributing!
- How do we collaborate on this website - Branching? - Look into NCEAS scicomptask README for inspiration
Attendance: Angel, Daphne, Sam, and Camila
- We talked about making a website instead of a book
- Why a website?
- Learn Quarto by doing!
- Have a place where we can show who we are, what we do, and how we came together.
- Have blog posts about the tools we share within the group!
- Have a centralized place where we gather all of our shared resources.
- Use issues in this repository to plan, coordinate, and communicate ideas.
- Create the website in Quarto
- Publish it through GitHub pages.