Skip to content

Commit count resets to 0 on merging from feature branches to develop #1992

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

Closed
aryak007 opened this issue Dec 14, 2019 · 2 comments
Closed

Commit count resets to 0 on merging from feature branches to develop #1992

aryak007 opened this issue Dec 14, 2019 · 2 comments
Labels

Comments

@aryak007
Copy link

aryak007 commented Dec 14, 2019

Our gitflow is an obvious one and we're using ContinuousDeployment

  • A branch named feature/something is branched off from develop.
  • Some work is done on feature/something.
  • Meanwhile, other branches are also created from develop and are worked upon.
  • The branches are merged to develop by submitting a PR from the feature branches.
  • The number of commits on the develop keeps on incrementing until one merge resets the commit count.

We're using the docker image gittools/gitversion-dotnetcore:linux-4.0.1 (so, our version is 4.0.1) and our issue is very closely related to these:

#700
#814
#681

What I've figured out so far is that the counting starts as Gitversion detects the merge base and detects the count from that point. Since, we're not rebasing, can that be a possible reason for this behaviour?

Also, will taking a new version of GitVersion improve our chances of mitigating this error?

The point where the reset happened is highlighted in blue.

@aryak007 aryak007 changed the title Commit count resets to 0 on merging from feature branches to develop Bug: Commit count resets to 0 on merging from feature branches to develop Dec 15, 2019
@aryak007 aryak007 changed the title Bug: Commit count resets to 0 on merging from feature branches to develop Commit count resets to 0 on merging from feature branches to develop Dec 15, 2019
@asbjornu
Copy link
Member

As asked in #814 (comment) it would be great if you could try out a more recent version of GitVersion to see if it behaves the same way.

@stale
Copy link

stale bot commented Mar 16, 2020

This issue has been automatically marked as stale because it has not had recent activity. After 30 days from now, it will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale label Mar 16, 2020
@stale stale bot closed this as completed Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants