0

In git, you can merge --squash a branch so the entire branch becomes one commit. You can reset the head of the project to delete the latest commits.   Is there a way to access these features in Mendix? Or to get the Mendix git credentials to handle these things from the terminal?   I was able to get changes from a branch without commit history, but it was somewhat of a hack. I was not able to revert to an earlier commit, losing the later history.   To merge the branch: In the terminal, typed git merge origin/tmp. (the App.mpr had file conflicts) git checkout --theirs App.mpr. Then open studio pro and commit the changes. Only one commit in the history.   It was not possible to push changes from the terminal since this would prompt for a git login. I tried generating a Mendix token and pushing from the terminal, but when I entered the token it was not recognized as valid.   One of the reasons our team used branches when we were in svn was so that we could merge the branch as one commit and not save the bad commits. We also wanted our commit history to be shorter and less cluttered.   One more thing is that our team commits quite often. As such, the buildup of the number of .mpr files will start to become heavy on download.  

asked 2024-08-17

1 answers