Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Philip Oakley
- Original Message - From: Paul Smith To: git-users@googlegroups.com Sent: Monday, March 11, 2013 3:33 PM Subject: [git-users] Reset branch to master after merge I've been searching but I've not found anyone else asking about this. In my workflow I tend to do

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Ryan Hodson
Yea, that last bit is a bit outside the norm, and yes, I'm saying that you should just delete it and recreate it later on. It basically has the same effect as resetting it to master, but it's less hassle and you don't have an extra topic branch laying around. What I was getting at was that this is

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Paul Smith
On Mon, 2013-03-11 at 10:54 -0500, Ryan Hodson wrote: > > 1) Use the topic branch as a short-lived branch that just serves as an > isolated environment for you to do some work on a particular feature. > This means you would delete it as soon as you merge it into master, > because that "feature" is

Re: [git-users] Reset branch to master after merge

2013-03-11 Thread Ryan Hodson
Paul, It sounds like you have one of two options: 1) Use the topic branch as a short-lived branch that just serves as an isolated environment for you to do some work on a particular feature. This means you would delete it as soon as you merge it into master, because that "feature" is done, at lea

[git-users] Reset branch to master after merge

2013-03-11 Thread Paul Smith
I've been searching but I've not found anyone else asking about this. In my workflow I tend to do a bunch of work on a topic branch, merge it to master, then do some other things and come back a few weeks later and pick it up again. Obviously when I start working on it again I want to start w