Question

.gitignore conflict when pulling from main branch

0

Hello, i get this conflict with .gitignore file when pulling from main branch

asked 2025-01-09

Youssef Ben Jamaa

3 answers

Pragadeeswaran Sivakumar · Answer 1 · 2025-01-10

Hi ,

follow this steps

From StudioPro: View -> Show App Directory in Explorer -> RightClick .gitignore.

Aaron Tom · Answer 2 · 2025-01-09

Hi Youssef,

You could solve this conflict with TortoiseSVN/TortoiseGIT. See:

https://community.mendix.com/link/space/studio-pro/questions/134202

Edit: I see your question at the other forumpost:

You should right click your Mendix project folder. From StudioPro: View -> Show App Directory in Explorer -> RightClick .gitignore.

Youssef Ben Jamaa · Answer 3 · 2025-01-15

I don't find the button solve when right clicking on app directory and tortoiseSVN

Screenshot 2025-01-15 110753.png