So I have a project on python anywhere where we pull changes from a GitHub repo to python anywhere. The problem is that we have been getting merge conflicts and we have been unable to find a reasonable solution for this, normally we have text editors which open up where we can resolve conflicts. Can you please guide onto this that what is the standard way to do so on python anywhere which can support resolution of large amount of conflicts.
Forums
How can we manage merge conflicts in python anywhere
If you open the file that have merge conflicts in our in-browser editor, you can see the conflicts -- I normally find them by searching for ====, which is what git uses to separate the upstream changes from the local ones in its diff markers.
giles
|
11800
posts
|
PythonAnywhere staff
|
Appreciate your prompt response.
No problem, glad to help.
