Our git workflow is either FETCH & REBASE for local commits or PULL. A feature X for 2018Release2 is required (but not for 2018Release1). However, the 2018Release2 repository (not branch) is not created yet. Therefore I will start working on the feature X at the current 2018Release1 repository. I will do local commits but will not push to the current 2018Release1 repository. What is the best strategy to do this? Do I create a branch? If yes, then creating a branch in Eclipse EGit has the following choices, which one should I choose? 1. "Merge upstream commits into local branch": When pulling, the changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be merged with the new changes. This is the default if the new branch is based on a remote tracking branch (but this default may be overridden by specific repository configuration) 2. "Rebase commits of local branch onto upstream": When pulling, new changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be rebased onto the updated remote tracking branch 3. if you uncheck the option "Configure upstream for push and pull"): When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
