Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

13
  • 25
    I have a concern about this approach. When I run git log --graph, the graph show the master is actually merged to the topic branch. Will this cause any problem in the long run? I thought the best practice is always merge the topic branch back to master. Please comment. Commented Nov 16, 2011 at 18:55
  • 4
    Look out for this issue if you're going with the merge workflow: randyfay.com/node/89 Commented Jun 6, 2013 at 17:57
  • 36
    You are merging master into b1. Why do you got push origin master... doesn't make sense. You're not changing master branch. I think it's a mistake with 119 upvote :/ Commented Jan 25, 2016 at 11:12
  • 57
    Do not use the merge method, using git rebase master is the correct answer Commented Jan 12, 2017 at 17:33
  • 20
    For those of us reading later - @Kursion 's concern about the typo was addressed by the author's edit. Also, the second highest upvoted answer below says basically the same thing as this answer but with a diagram of the branch structure and a warning as to why you wouldn't want to rebase. Commented Jul 5, 2018 at 15:28