search

phetsims / quadrilateral

"Quadrilateral" is an educational simulation in HTML5, by PhET Interactive Simulations.
GNU General Public License v3.0
1 stars 3 forks source link

branch: wip-2-3-23 #350

Closed jessegreenberg closed 1 year ago

jessegreenberg commented 1 year ago

Testing out making commits here today to get around pre-commit hooks so I can just run them once at merge.

samreid commented 1 year ago

Just a heads up, when I reviewed the carousel branches with @jonathanolson, he recommended using rebase instead of merge. I don't recall exactly why, but I think he said it would improve and simplify the commit history after recombining.

jessegreenberg commented 1 year ago

Thanks, sounds good. I read up a bit at https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge and https://www.atlassian.com/git/tutorials/merging-vs-rebasing.

The TL;DR

What is a merge?
A commit, that combines all changes of a different branch into the current.

What is a rebase?
Re-comitting all commits of the current branch onto a different base commit.

But the comments listed pros/cons of each. For what I wanted to do with this branch I do think rebase is best.

jessegreenberg commented 1 year ago

OK, work from Friday merged into master, I had to do this: https://stackoverflow.com/questions/44114627/git-rebase-onto-master-not-doing-anything

first rebase then followed with a merge, and the result was all the commits from the branch being committed at the end of master. Closing.