Github: merging from master back into feature branch

 

I have two questions:

  • Does github for Windows use the --no-ff flag for merging ?

  • I have a few branches:

  • master branch: holds the latest official version
  • development branch: holds the lastest dev version
  • "feature" branches, namely dbObjects and startMenu

    • Now, I have updated dbObjects and startMenu and merged them into development . The development branch works just fine. However, the two branches ( dbObject and startMenu ) don't have the latest version: startMenu doesn't have dbObject 's updates and vice-versa.

    I have more development on startMenu and dbObjects branches to do, so it's important for me to update those branches as well. Should I merge development into each one of them, or is there some other way to do it in Git?

    Thanks!

    EDIT : startMenu and dbObject will be shared on origin. is it safe to use re-base in that case?

    1/ No

    The one place where GitHub for Windows could specify using a no-ff for merge is in the "system" config file, that is the config file from the git distribution embedded in GitHub for Windows.

    You can find it in: 

    %LOCALAPPDATA%GitHubPortable_Git_xxxxxetcgitconfig

    For instance: 

    C:UsersVonCAppDataLocalGitHubPortableGit_64179092f39f5dacb60dcab147fb4d04266c0eaeetcgitconfig

    And it doesn't contain: 

    [merge]
  ff = false

    (which would force a merge commit)

    2/ I agree with the rebase.

    As long as you don't already have pushed those branches to GitHub (or even if you have, but nobody else has cloned that GitHub repo), you always can rebase your feature branches on top of the updated development branch.

    See "git rebase vs git merge" for more.

    链接地址: http://www.djcxy.com/p/49242.html

    上一篇: 在git rebase之后推送分支时出错

    下一篇: Github：从主人合并到功能分支