Change the "Getting Started" doc to recommend rebase over merge.

Review Request #5399 — Created Feb. 4, 2014 and submitted

Information

Review Board
master

Reviewers

Change the "Getting Started" doc to recommend rebase over merge.

Using merges can be annoying and error-prone with a more-or-less centralized
development model, and I think this instruction has caused more than a couple
mistakes (the latest one being where one of our students merged his branch into
master, rather than the other way around).

This commit changes it to suggest rebase instead. While rebase can also be
annoying and error-prone, I think it's probably more likely to help people keep
a clean history.

Built the codebase doc and saw the new text.

Description From Last Updated

I know it's more wordy, but I kind of like the explicit checkout and then rebase for new users. "git …

chipx86chipx86
chipx86
  1. 
      
  2. docs/codebase/getting-started.rst (Diff revision 1)
     
     
    Show all issues

    I know it's more wordy, but I kind of like the explicit checkout and then rebase for new users. "git rebase master new-branch" reads like "rebase master onto new-branch," and for users new to Git, I'd like to avoid that confusion.

  3. 
      
david
chipx86
  1. Ship It!

  2. 
      
david
Review request changed
Status:
Completed
Change Summary:
Pushed to master (22f35d1).