appsmithorg / appsmith

Platform to build admin panels, internal tools, and dashboards. Integrates with 25+ databases and any API.
https://www.appsmith.com
Apache License 2.0
34.62k stars 3.73k forks source link

[Bug]: After auto-commit runs on a particular branch, I see a page commit to be committed manually #34383

Open btsgh opened 4 months ago

btsgh commented 4 months ago

Is there an existing issue for this?

Description

When I connect to a git connected app, and navigate to a particular branch, auto-commit runs, but manual commit for a page is seen.

Steps To Reproduce

The app used is this repo git@github.com:btsgh/release_3jan_new.git

This is seen on the particular branch named - laveena.

The commit difference can be seen here [Created a new branch from the branch where one manual commit showed up and found this difference]: https://github.com/btsgh/release_3jan_new/commit/e8f79c3fbde3ff79d78d27d39cf814ee5369e176

Screenshot 2024-06-21 at 2 57 15 PM Screenshot 2024-06-21 at 2 57 08 PM

Public Sample App

No response

Environment

Release

Severity

Medium (Frustrating UX)

Issue video log

No response

Version

Cloud

RakshaKShetty commented 4 months ago

tried this on another app and the diffs which we have seen https://github.com/RakshaKShetty/git_jun5_import_app1/commit/4ae6082f342afcd076d509d149dec25775e33786 image

sondermanish commented 4 months ago

@RakshaKShetty The branch issue has been branched off from master of the application, and this app has not gone under autocommit yet. as it's evident from this commit for cleanup

image

This has happened before an autocommit happened on master branch because the common denominator commit for branch master and issue is common parent

image

This can happen due to autocommit being switched off/autocommiting not progressing due to ongoing autocommits in other branches.

the commit on issue branch migrates server hence we don't expect anymore autocommit.

RakshaKShetty commented 4 months ago

@sondermanish 1.We feel this might be the same issue which this user has faced so lets not close it but just keep it medium and try to repro the exact steps for fixing it. https://theappsmith.slack.com/archives/C0341RERY4R/p1720803036739129

  1. This can happen due to autocommit being switched off/autocommiting not progressing due to ongoing autocommits in other branches. Can we put this in our documentation so that users will be clear that there might be some delay
Nikhil-Nandagopal commented 3 months ago

Bumping this issue up to prod because it should have made it's way there by now if it was not fixed

btsgh commented 3 months ago

@sondermanish - here is another example of a git imported app where I am seeing commits even after auto-commit runs This is where the diff can be seen - https://github.com/btsgh/2aprregapp/commit/a969a3aa55c5227a1a4353a4c23d3d73bcc473dc

Screenshot of the diff-

Screenshot 2024-08-05 at 12 42 26 PM
sondermanish commented 3 months ago

@btsgh won't come under autocommit no? this is a separate change.

btsgh commented 3 months ago

Not sure I get that? You mean this should be a separate bug? Why not part of auto-commit? Ideally these commits should also have been taken care of in the autocommit action itself right . .. @sondermanish