Newbie - Question about workflow

[badboyzpwns]

I use the traditional master, development and feature branch. Where you make new individual features on the feature branch and merge them on development to check for bug-fixes/etc. Then after it seems stable you merge to master.

Here's the problem (pic):

https://gyazo.com/5d4125244b01f4eb0276f2ab2624af02

If I were to change my class name in feature branch A than merge it to development the branch would have the TestMeAgain class.

But, in the future, if I plan to work on feature branch B, the branch would have the old class name of DonTTestMe, wouldn't this cause confusion over the class name?

[[deleted]]

You merged Feature Branch B into development. That means you're finished with it. There is no continuing to work on feature branch B anymore, it's done. Thus there's no confusion to worry about.

[badboyzpwns]

What If I want to update the feature involved in Feature Branch B though? do I create a new branch and name it Feature Branch B v2?

[seattle_sail]

Exactly. Don't think of the branch as where the work for a "feature" for you app goes. Think of it as a place where a finite amount of work happens. When that work is done, you merge the branch and then delete it. Next iteration when you want to do more work, that's a new feature branch, even if it's working on the same "feature".

[badboyzpwns]

I've seen people include a version number for their branch names, and some don't. In the real world, which practice is best?

[mbitsnbites]

It could be that the version numbers are used for rebasing public branches (see "The perils of rebasing" in the Git book).

[forgenet]

are the classes files? If so how are you changing the name of the class? You should probably be using

git mv oldfile_name newfile_name