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.

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

Add rebase-multiple-commits exercise #357

Merged
merged 1 commit into from
Sep 4, 2023

Conversation

BaoCaiH
Copy link
Contributor

@BaoCaiH BaoCaiH commented Aug 15, 2023

Add exercise suggested in issue #354

@sofusalbertsen
Copy link
Contributor

Hey there, thanks for your PR!
I will try to get some eyes on it this week 👀

@JKrag
Copy link
Contributor

JKrag commented Aug 31, 2023

Thanks for the reminder @sofusalbertsen. I had already taken a quick look at this 2 weeks ago when I was in Helsinki, and was testing it out and testing some small changes last week, but then I ran of of time. will try and get back to it tomorrow.

@JKrag
Copy link
Contributor

JKrag commented Sep 4, 2023

Hi Bao. Thanks again for the PR.
The exercise works fine and illustrates some valid points and differences between the two scenarios.

I think I had a few ideas for minor improvements, when I looked at it a few weeks ago - something about changing the actual content of the files to make it more obvious what was before and after, helping with the conflict resolution, but maybe I am just overthinking it.
I think I will just merge it in as is, and try it out on some training participants. ;-)

@JKrag JKrag self-requested a review September 4, 2023 19:40
@JKrag JKrag merged commit 268f094 into eficode-academy:master Sep 4, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants