search

semaphoreP / codeastro

Course Material for the Code/Astro Workshop
BSD 3-Clause "New" or "Revised" License
164 stars 68 forks source link

git basics lesson 2024: for next year #171

Open mwhosek opened 2 months ago

mwhosek commented 2 months ago

Issues that came up:

  1. When resolving conflicts, git returned an error about what default to use when resolving divergent branched:

hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only

We haven't run into this in the past? Didn't come up on my own machine since I must have set this global variable long ago.

  1. For the bonus activity (group using one person's demo repo, causing conflicts), the person whose demo everyone is using must give group members explicit permission to push to it. Need to add this
mwhosek commented 2 months ago

Nice summary of git merge vs. git rebase:

https://www.atlassian.com/git/tutorials/merging-vs-rebasing