pulling and commiting and pushing is confusing.

Question

8

so I want to pull.

I cant:

ok I will commit then

now I have to answer remote changes, but all I wanted was to get my colleagues updates????

vague error code.

I guess I'll pull again.

it is now asking what to do with changes....

I have no idea what changes are incoming, so I don't feel confident making a choice, but I'll go for merge, as the otherone gave me an error.

project is now updated ....

I like the old 1 click way beter

asked 2024-01-10

Jason Teunissen

4 answers

Jason Teunissen · Answer 1 · 2024-01-10

if you get the issue you can use TortoiseGIT

https://tortoisegit.org/download/

Solution originally from Leon:

https://forum.mendix.com/link/space/app-development/questions/105455

Kitti Bradley · Answer 2 · 2024-01-10

Also struggling with how to resolve this issue when I have no idea what the conflicts are, or what is meant by "external tool"

Screenshot 2024-01-11 114425.png

Jason Teunissen · Answer 3 · 2024-01-10

this chain

https://forum.mendix.com/link/space/app-development/questions/125915

Kitti Bradley · Answer 4 · 2024-01-10

Wish I could upvote this 100x