#Conflicts when trying to pull changes

1 messages · Page 1 of 1 (latest)

haughty bronze
#

Hello everyone,

I am encountering a problem with our Appsmith application, which is linked to our GitLab repository. When I attempt to fetch updates from the remote repository, I'm receiving errors due to conflicts. I'd greatly appreciate any assistance in resolving this issue. Thank you in advance.

pure viper
#

@haughty bronze I had potentially the same problem with GitHub. When Appsmith updated there were some commits with the remote master that hadn't been pulled to the local master and then after the update I can't commit or pull from master, even if I update the remote master branch via the GitHub UI. I haven't gotten a solution from Appsmith yet (they responded but the thing they asked me to try wasn't achievable) but I found a work-around:

  1. rename app to something else, such as "..._BROKEN"
  2. create a new app via import and import the app from Git again.

Not ideal, have to direct users to the new version of the app, but it worked and I can get back to building. They will probably actually fix it eventually but I couldn't wait.

karmic mesa
#

Hello @haughty bronze ! Can you follow the setups below to resolve the merge conflicts?

  1. Take a branch temp-branch from head of master
  2. Reset the commits on main.
  3. Push the local commits to remote master.
  4. Merge temp-branch to main through a PR and resolve conflicts.

Let me know if this helps.

lament oysterBOT
#

Hey There,

We've registered your query, and our team will get back to you soon.

Regards,
Pranav

haughty bronze
#

Sorry guys, had a bit of holiday.

Followed @pure viper's suggestion and it worked.

Thanks a lot for your help both!

Very helpful.