|Branch Creation Dialog choices [message #1782698]
||Wed, 28 February 2018 02:11
| Albert Kao
Registered: April 2016
Our git workflow is|
either FETCH & REBASE for local commits
A feature X for 2018Release2 branch is required (but not for the 2018Release1 branch).
However, the 2018Release2 branch is not created yet.
Therefore I think I will create a branch for feature X out of the current 2018Release1 branch.
I will do local commits to my feature X branch but will not push to the 2018Release1 branch.
I will transfer my codes from the feature X branch to the 2018Release2 branch when it is created.
The Branch Creation Dialog in Eclipse EGit has the following choices, which one should I choose? Why?
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 branch 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
[Updated on: Wed, 28 February 2018 02:18]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.01475 seconds