On 04/13/2015 05:38 PM, Rene Rivera wrote:

On Mon, Apr 13, 2015 at 2:25 AM, Dmitry Moskalchuk <dm@crystax.net <mailto:dm@crystax.net>> wrote:

    On 13/04/15 08:43, Vladimir Prus wrote:
    > - When updating from git, do:
    >
    >        git fetch
    >        git rebase develop origin/develop

    Just a note: the same could be achieved by "git pull --rebase", or even
    turned to be permanent:

         git config branch.develop.rebase true
         git pull # it will rebase instead of merge now

    Note, however, that rebase is not the same as merge, so it could be
    dangerous in some cases. There are many explanations around why is it
    so; for example, this one:
    http://stackoverflow.com/questions/18137918/git-pull-rebase-this-is-a-possibly-dangerous-operation.


Read that.. Doesn't clear anything up. Here's some basic questions.. What should I do if I'm using the Eclipse git integration? Should I
look into using Mercurial to deal with the git repos as a more sane alternative?

If you're using egit, you should be able to right-click project in project navigator, pick Team->Fetch From Upstream, and
then pick Team->Rebase and select origin/develop.