Lots of useful info here https://www.atlassian.com/git/tutorials/merging-vs-rebasing
Most important, before a master commit: git checkout feature git checkout -b temporary-branch git rebase -i master # [Clean up the history] git checkout master git merge temporary-branch --emi On Mon, Oct 2, 2017 at 4:16 PM, Eric Barboni <sk...@apache.org> wrote: > Hi, > > I started a new page [1] to help people making PR. I'm novice in git and > nice workflow with GitHub. > > > > Changing name and mail seems to be important but as git by default allow > committing with local name you may lose a bit of time (:D) . > > Many thanks to Matthias and Emilian > > Regards > > -Eric > > > > [1] > https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=74681408 >
