I'm not sure what you're seeing is caused by "rebase". I think it's caused by me climbing the learning curve on how to do things in GIT...
I think I didn't ever merge your changes, but rather looked at them and then did a copy of them (with some further modifications) into a different branch. (Before I knew about how to do pull requests). -M On 10/24/2019 4:13 AM, Richard Eckart de Castilho wrote: > On 6. Jun 2019, at 16:14, Richard Eckart de Castilho <[email protected] > <mailto:[email protected]>> wrote: >> >> On 6. Jun 2019, at 16:11, Richard Eckart de Castilho <[email protected] >> <mailto:[email protected]>> wrote: >>> >>> - rebase is nice for small commits >> >> ... small PRs (not small commits) > > I'll take that back. Attached is a screenshot which highlights why I don't > really like rebase commits at all. > > The red box contains two branches which I created locally and which I had > created PRs for. I cannot see easily in the history whether these commits have > already been merged because there is no "arc" from those branches back to the > branch into which they were merged. Looking carefully at the history, I can > indeed see the same messages in the master and v2 branches, so I could assume > that my PRs have been merged - but they could also be other commits just > bearing the same message. When I try to delete my local branches, my git > client (Sourcetree) wisely asks me if I am sure I want to do this, because it > cannot determine either that the changes were merged. If it could it wouldn't > ask me. > > So for what it's worth: I'd prefer staying away from rebase merges. > > Cheers, > > -- Richard >
