feenkcom / gtoolkit

Glamorous Toolkit is the Moldable Development environment. It empowers you to make systems explainable through experiences tailored for each problem.
https://gtoolkit.com
MIT License
1.06k stars 46 forks source link

CLI git doesn't pull/merge correctly. #3843

Closed refactoringdr closed 1 week ago

refactoringdr commented 1 week ago

If the remote has changes and the local has changes, a pull results in the local commit being discarded and the image differences show up as changes that need to be committed again. This is a "poor man's merge", but is unexpected.