dev shows ahead of master after automerge

[Deepak Rajagopal]

We have 2 branches dev and master (long lived) with short lived feature branches.

We merge from feature-branches to dev then issue a pull-request to master. After 2 people approve we merge pull request to master. We also have auto merge from master back to dev to cover cases where we make changes bypassing dev.

Our problem is that after the automerge we see that dev is ahead of master with no diff.

From below picture you can see commit hash ef0a7.. contains b829c.. (which in turn contains e160e.. and eab15..)

Thanks for any help you can provide.

[Deepak Rajagopal]

Hi @Baskar Annamalai,

Thank you for responding. Our history has progressed a little past when I made this post but here are logs

MASTER-------------

672e0ff50be4b86be45f6eccbc6c051b900d2fe (HEAD -> master, tag: addFavicon, origin/master, or
igin/HEAD) Merge pull request #10 in xxx/xxxxxxxxxx-ui from dev to master
b40b5e31c8ecbffb8d7b4758e7927c1768c957d1 (tag: updateCUIFQDN) Merge pull request #9 in xxx/x
xxxxxxxxx-ui from dev to master
304b6c4487f88fc8b7715786668cd5863d335bcc (tag: updateFQDN) Merge pull request #8 in xxx/xxxx
xxxxxx-ui from dev to master
b829ccee384de24ffc1a4fbda25afe8921edf030 (tag: uichanges, origin/bugfix/mergebranch) Merge pull request #2 in xxx/xxxxxxxxxx-ui from dev to master
3806ae3567f05829dce0738ba9edef6fff1e9b9f cleanup
5b68c824ddfd64d9990a312b27d9d246577e1c7a change value type to string
481ad00de04224f7dc7e17375bb1547a085f4498 remove api
b1f6837dce4fc358cd09270d0f3b7c9b4cc0654e update path
9723e2714141e529aefab17715fa3ea8e24fff50 delete cookie
63ab836a08b650c1c54676b885239fa3e6dd7178 update path
25a3436928f90c8bc0a2b5b6802578eb7230e5ac update path
b93ad2976e8e67693236c5fb50c515623efd1449 update base url and deploy url
b5eb06631de6b6646388f53c8cc7e9e9fe7a2d44 update context path
d53d1e7116dfbbac8a072242a67ec97e65d88075 update context path

MASTER SNIPPET END---------------

DEV------------------------

9efdee98caedc47eea54ee4234c5f546344d02cb (HEAD -> dev, origin/dev) Automatic merge from mast
er -> dev
7672e0ff50be4b86be45f6eccbc6c051b900d2fe (tag: addFavicon, origin/master, origin/HEAD, master) Merge pull request #10 in xxx/xxxxxxxxxx-ui from dev to master
78247bf84c9c04b7cea4ad3e5cc67e85ff450b10 Merge branch 'dev' of http://10.253.180.80:7990/scm/xxx/xxxxxxxxxx-ui into dev
9ff56e19646c766787bf55b8634641a59f12ff9f add favicon
b40b5e31c8ecbffb8d7b4758e7927c1768c957d1 (tag: updateCUIFQDN) Merge pull request #9 in xxx/xxxxxxxxxx-ui from dev to master
fda624a77589875d8344a869d301d7de422aef6b Automatic merge from master -> dev
dc779fb3f99213ab7a9004a28f6a6d9406f95340 revert fqdn
304b6c4487f88fc8b7715786668cd5863d335bcc (tag: updateFQDN) Merge pull request #8 in xxx/xxxxxxxxxx-ui from dev to master
ef0ee9be7df41c8a1fb6c3e0b7aec718aedf1c64 Automatic merge from master -> dev
49451545ee0e0dd13f9aa8a90b15b6a10509de54 update fqdn
8a8cbf048f99f1de50ab84684f938e630e9f8c46 update build
225bd996db97f98fa2e0da00355ccc3d9ff49f4b Merge branch 'dev' of http://xxxxxxx@10.253.180.80:7990/scm/xxx/xxxxxxxxxx-ui.git into dev
731d674fdd496f334a6b627e178b36d039b6b977 update polyfil
ef0a78d7122d2dc1fa6c457d55f563029a1e8ec3 Automatic merge from master -> dev
b829ccee384de24ffc1a4fbda25afe8921edf030 (tag: uichanges, origin/bugfix/mergebranch) Merge pull request #2 in xxx/xxxxxxxxxx-ui from dev to master
e160e435df638b66e301c9603ca4f17be85c2073 update pom
eab15aa1e90e5e98fbcd38c0387e238f01114f15 Merge pull request #1 in xxx/xxxxxxxxxx-ui from bugfix/LandingPageAlignment to dev

DEV SNIPPET END------------

[Baskar Annamalai]

Hi @Deepak Rajagopal

Could you check the history of both branches via local repository and post it here? It worth looking into the branch log to identify if the history is as recorded in the remote branches.

Regards.