Skip to content
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

Remove the 2nd part of conflicts #36

Open
sstevens2 opened this issue Jan 12, 2022 · 1 comment
Open

Remove the 2nd part of conflicts #36

sstevens2 opened this issue Jan 12, 2022 · 1 comment
Labels
enhancement

Comments

@sstevens2
Copy link
Collaborator

I think we can replace the part where you see that conflicts "remembers" the resolution. I don't usually teach it. Instead maybe we put a callout that mentions the important parts.
@sstevens2
Copy link
Collaborator Author

Would like to get other instructors feedback on this. Do you teach the 2nd part of conflicts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@sstevens2