What is the best way to keep your fork up to date with the master branch
Hi all
When I contribute to umbraco/Umbraco-CMS on Github I follow the getting started instructions:
Fork it, clone it, build it, watch it, change it, test it, commit it, push it, PR it.
But my fork goes out of date pretty quickly.
Please can you tell me the best way of keep it up to date with dev-v7 on umbraco/Umbraco-CMS?
Everything I try usually fails so I end up deleting the fork and starting again every time.
The simplest is to rebase on the newest release. You'll get merge conflicts if any, but it will all be stacked on top of the commit you rebase on. Here's the docs to do it with Git Extensions:
See too "Syncing your fork with the original repository" on this page. The couple of command line steps detailed there are what I've been following when wanting to update my fork with the latest.
What is the best way to keep your fork up to date with the master branch
Hi all When I contribute to umbraco/Umbraco-CMS on Github I follow the getting started instructions: Fork it, clone it, build it, watch it, change it, test it, commit it, push it, PR it.
But my fork goes out of date pretty quickly.
Please can you tell me the best way of keep it up to date with dev-v7 on umbraco/Umbraco-CMS?
Everything I try usually fails so I end up deleting the fork and starting again every time.
Thanks
Paul
Hi Paul,
The simplest is to rebase on the newest release. You'll get merge conflicts if any, but it will all be stacked on top of the commit you rebase on. Here's the docs to do it with Git Extensions:
http://git-extensions-documentation.readthedocs.io/en/latest/branches.html#rebase-branch
Lars-Erik
Thanks Lars I'll have a look.
Cheers
Paul
See too "Syncing your fork with the original repository" on this page. The couple of command line steps detailed there are what I've been following when wanting to update my fork with the latest.
Andy
That's exactly the bit of information I needed. Thanks Andy, I appreciate it.
For anyone else that lands here - URL is now:
https://github.com/umbraco/OurUmbraco/blob/master/CONTRIBUTING.md
is working on a reply...