On 5/1/19 10:13 PM, Thomas Holder wrote:
Hi Diederik,
It's all good, you didn't mess anything up. But yes, most of us use a slightly different workflow: git rebase. Rebasing is particularly easy if you make a merge request instead of pushing directly to master, because the web interface has a Rebase button :-) You did a regular merge (actually you merged twice). See attached image which shows the merge graph. If you would have rebased instead, your commit would have simply been moved to the top of the history.
Nothing gets queued in git, but push time doesn't affect commit time. You committed yesterday, but pushed today.
Cheers, Thomas
Thanks Thomas, this is really helpful! I will start using rebase from now on, after I've done some reading.
Diederik