[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [ptp-dev] ptp_7_0 branch created
|
On Thu, Jun 20, 2013 at 3:35 PM, Christopher Navarro
<cmnavarr@xxxxxxxxxxxx> wrote:
> On 06/20/2013 02:11 PM, Roland Schulz wrote:
>
>
>
> On Thu, Jun 20, 2013 at 11:13 AM, Christopher Navarro
> <cmnavarr@xxxxxxxxxxxx> wrote:
>>
>> I still have some questions about getting things setup right for checking
>> in fixes to a branch and then merging them to master:
>>
>> 1) Is there a way inside Eclipse to checkout both ptp_7_0 and master as
>> "Local"? The only way I can seem to find is to switch to command line and do
>> a git checkout -b branch-name origin/branch-name.
>
> You can do this in Egit with Team->Switch To->New branch.
>
>
> When performing the Switch To > New Branch, it asks for a Pull Strategy.
> What is the best/correct Pull strategy? Rebase is selected by default in the
> dialog box inside Eclipse, but the EGit wiki shows "Merge" selected.
I recommend to use rebase. Avoids unnecessary merge commits.
Roland
--
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309
