New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git basics lesson 2024: for next year #171

Open

mwhosek opened this issue Jul 15, 2024 · 1 comment

Collaborator

mwhosek commented Jul 15, 2024

Issues that came up:

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.

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

Collaborator Author

mwhosek commented Jul 15, 2024

Nice summary of git merge vs. git rebase:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment