Hello Jacques, [email protected] writes:
> This is an automated email from the ASF dual-hosted git repository. > > jleroux pushed a commit to branch trunk > in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git > > > The following commit(s) were added to refs/heads/trunk by this push: > new 2af7119 Fixed: content/control/WebSiteCms?webSiteId=CmsSite fails > (OFBIZ-11266) > new 6f5924c Merge branch 'trunk' of > https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk > 2af7119 is described below In order to avoid unnecessary merge commits, I would recommend using ‘git pull --rebase’ instead of ‘git pull’ If you don't want to be bother with the extra ‘--rebase’ argument you can configure git to automatically rebase instead of merge when doing ‘git pull’ with: git config --global pull.rebase true HTH, -- Mathieu Lirzin GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
