working with GitHub

This public forum is for user-to-user discussions of ASP.NET Maker. Note that this is not support forum.
Post Reply
darkdragon
User
Posts: 148

working with GitHub

Post by darkdragon »

Hello,

I have some trouble working on two different users within the same project.
We did the following:

  • established a common user account on GitHub with proper permissions (we have paid user accounts on GitHub)
  • generated a personal token to be used in the Git password advanced settings

Everything works if the project is being used by a single user: on every save the file is updated on the local git; triggering push/sync, the file is updated on GitHub, too.

Now, if the second user opens the <project>.agx file (from another laptop / user profile) and tries to change something and save it locally, an error window appears:
unresolved conflicts exist in the index

Any ideas? Should we have done something when the second user opens the project?


MichaelG
User
Posts: 1095

Post by MichaelG »

Please always sync to the repository (Git -> Sync) before starting to make any changes.

To resolve conflicts, please read "Handling Conflicts" in the following article:
https://aspnetmaker.dev/docs/#/git.html ... -conflicts


Post Reply