#Git Merge into master / main branch not working

1 messages · Page 1 of 1 (latest)

dry tendon
#

I have ongoing issues trying to merge my changes into the master branch using both Appsmith process and external process.

kindred cedarBOT
#

Hey there,

Thank you for reaching out to the Appsmith support team. We've registered your
query, and our team is reviewing it.

In the meantime, to help us debug the issue, please consider following steps and
provide us the information:

  • If there are conflicts, please go to the git repo UI and try to solve them and
    merge the branches. Later you should be able to pull the changes to Appsmith and
    sync the progress.
  • If you are getting a version mismatch error, please upgrade your instance to
    newer version where the App was developed.
  • Lastly, please let us know which version of Appsmith you are using and share
    server logs
    (guide),
    along with the error on the UI

Best regards,
Jimmy H

dry tendon
#

Version: Appsmith Community v1.9.29
Released 11 days ago

#

I was advised to follow this procedure:
Step 1: in Appsmith, create a branch from master branch
Step 2: Go to Github and create a Pull Request - compare the new branch to original branch
Step 3: Click Resolve differences and work through the conflcts, resolving the differences
Step 4: Merge the new branch into origin branch
Step 5: Open Appsmith: go to origin branch
Step 6: Discard and Pull changes

kindred cedarBOT
dry tendon
#

I'm downloading the logs right now... However, I want to say that I think I've tried so many ways to get this right that I've clogged up the works with my failed attempts... i.e. I've created many branches and merges (origin --> copy of origin, copy of origin --> origin... all kinds of conflict resolutions, more merges... I have a baseline of code I'd like to get to ... and essentially start over from scratch if possible.

I'm also looking at using a non-Git methodology, which is scary in its own way. I'd like your opinion on that.

Logs to follow.

dry tendon
#

I have been able to establish nonGit versions of my sister applications which I will go with in the near future until I can feel confident about Git. I realize that I’ve got quite a bit to learn about Git, but I’m not feeling like I’m furthering my education at this point… I’m happy to talk and work through my issues if it helps Appsmith … my client prefers what Git offers, but he also wants progress, which I’ve not been able to produce over the last week or so…

#

Ultimately our goal is to get back in the Git saddle ASAP

#

Our repositories are still in GitHub and we still have Git-based versions of our apps

kindred cedarBOT
#

Hello Paul, are you still facing this issue?

dry tendon
#

yes... We were able to created nonGit versions of our sister apps, so at least now we can move forward, albeit without version control