Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/1106 #1108

Closed
wants to merge 5 commits into from
Closed

Bug/1106 #1108

wants to merge 5 commits into from

Conversation

sebastianconcept
Copy link

No description provided.

Sebastian Sastre added 5 commits July 10, 2014 15:12
@ghost
Copy link

ghost commented Nov 1, 2014

Please rebase to master without d06c091 and 451faf8 from Jul. How did you get those there?
Also, 2931ed4 seems to repeat the same changes which are already in 5cecd2d. Did you erase them with the c9f709f merge?

@ghost
Copy link

ghost commented Nov 1, 2014

There is one more formal thing: please do not create branch names with slashes. They clash with remote naming like origin/master or upstream/grunt-devel-fix or so. People most often use dashes as separators in branch names.

@sebastianconcept
Copy link
Author

I think old stuff got in the middle and the merge bring that up

Will take a look

@sebastianconcept
Copy link
Author

What's the convention here for branch naming?

@ghost
Copy link

ghost commented Nov 1, 2014

There is no formal convention. I just name my ones after the feature they implement, dash-separated, or use gh-nnn for github issue nnn. But I saw no one using slashes, yet (maybe it wasn't even possible in previous git versions?).

@sebastianconcept
Copy link
Author

The slash in the branch name is typically used by tools to show them grouped as folders. I know git flow introduces it to create categories: bug, feature and hotfix.

I'm fine evading the use of slashes in future branches

@ghost
Copy link

ghost commented Nov 1, 2014

Ah. Didn't know. Ok. Maybe it got used more often when it's there - maybe just I missed the newest trends. Time will tell.

Sebastian Sastre wrote:

The slash in the branch name is typically used by tools to show them
grouped as folders. I know |git flow| introduces it to create
categories: bug, feature and hotfix.

I'm fine evading the use of slashes in future branches


Reply to this email directly or view it on GitHub
#1108 (comment).

@ghost ghost deleted the bug/1106 branch November 8, 2014 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant