Sign in Register
Copied to clipboard

Flag this post as spam?

This post will be reported to the moderators as potential spam to be looked at


  • Paul Seal 524 posts 2890 karma points MVP 7x c-trib
    Nov 05, 2017 @ 20:18
    Paul Seal
    0

    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

    Copy Link
  • Lars-Erik Aabech 350 posts 1102 karma points MVP 8x c-trib
    Nov 05, 2017 @ 20:22
    Lars-Erik Aabech
    0

    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

    Copy Link
  • Paul Seal 524 posts 2890 karma points MVP 7x c-trib
    Nov 05, 2017 @ 20:25
    Paul Seal
    0

    Thanks Lars I'll have a look.

    Cheers

    Paul

    Copy Link
  • Andy Butland 422 posts 2334 karma points MVP 4x hq c-trib
    Nov 05, 2017 @ 22:16
    Andy Butland
    101

    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

    Copy Link
  • Paul Seal 524 posts 2890 karma points MVP 7x c-trib
    Nov 05, 2017 @ 22:30
    Paul Seal
    0

    That's exactly the bit of information I needed. Thanks Andy, I appreciate it.

    Copy Link
  • Steve Morgan 1350 posts 4460 karma points c-trib
    May 11, 2020 @ 10:29
    Steve Morgan
    0

    For anyone else that lands here - URL is now:

    https://github.com/umbraco/OurUmbraco/blob/master/CONTRIBUTING.md

    Copy Link

  • This forum is in read-only mode while we transition to the new forum.

    You can continue this topic on the new forum by tapping the "Continue discussion" link below.

Please Sign in or register to post replies