I was trying to follow git-flow naming without insisting we use it.
However, the point I was trying to make is I don't have the access
rights to create a branch
Who grants these ?
On 27/05/2015 11:29, Pid wrote:
On 27/05/2015 08:51, Neil Stevenson wrote:
Ok, given we have a Jira for this now GEODE-38, we should have a branch
from develop for it
Should I be able to create branch "feature/GEODE-38" from *develop* ? I
can't currently
I recommend you look for a git-flow installation for your OS.
When installed & configured, (the suggested defaults will do), it will
extend git, adding some commands.
If you have a shell prompt that is configured to show a git branch,
you'd execute the command:
pid@host:asf/geode (develop =)$ git flow feature start GEODE-38_init_script
and then see it has created the branch:
pid@host:asf/geode (feature/GEODE-38_init_script)$
You execute:
pid@host:asf/geode (feature/GEODE-38_init_script)$ git flow feature
finish GEODE-38_init_script
and it merges back to develop.
At which point, I recommend that you ensure that your develop is up to
date before finishing any feature branches - and when pulling develop,
use --rebase.
pid@host:asf/geode (develop =)$ git pull --rebase
p
It'll be difficult to push without this. I could send a "*.patch" file
but then someone else needs
to apply it, much more work
N
On 27/05/2015 01:27, William Markito wrote:
+1 for develop
On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <[email protected]>
wrote:
On Tue, May 26, 2015 at 3:17 PM, Dan Smith <[email protected]> wrote:
Definitely branch from develop - master shouldn't get touched until we
release.
I think creating a JIRA for the feature request and mentioning it in
the
branch name is a good practice.
Question: are we comfortable with the decision of using develop
as the place for on-going development and nightly builds? Currently,
our jenkins builds from master which seems to be useless once
fixes start flowing into develop.
Thanks,
Roman.
