Forum o telefonach Nec

[juliediane]

My team use a simple model with Git.

Master branch is the latest development and is considered as unstable.
For RC (ReleaseCandidate) we make a new branch for every release and use the version as branchname. Like “2018.09”.

So the buildscript checkout and build master every morning.
Then on demand it can also build the named RC.

The git part of buildscript look like this:

git clean -fd // Git generic action to remove generated files etc
git fetch // Git fetch action with tags and force option checked
git checkout -f %BranchName% // Git generic action to choose branch
git reset --hard origin/%BranchName% // Git generic action to reset index
git pull %Repository% // Git generic ation to pull repository
git rebase --skip // Git generic action that rebase

If the last rebase action is fails it is ignored.
Updates were rejected because the tip of your current branch is behind
Now the problem is that RC builds can get commits from master branch.
I also had a feeling that the this sequence of actions can be simplified.

It should just reset everything and get the latest from specified branch to working dir.
Any advice how to improve/fix this ?[/url]

[Reklama]