I want to revert the entire Simulink Project to a specific revision. I am using Git source control.
How can I do that?
MATLAB: How to revert the Simulink Project to a specific revision when using Git
simulink
Related Solutions
This behaviour is observed when both the local and remote repositories have working directories.
If you create a GIT repository with a working directory you should be able to see your files in it, and commit, push and fetch.
So for example this behaviour can be reproduced with these steps:
- Create a repository, let's call it "ProjectA", add some files, make some commits.
- Clone this to another repository, "ProjectB", by setting ProjectB's "Repository Path" to ProjectA.
ProjectB is initially exactly the same as ProjectA, but pushing and fetching produces inconsistencies between the two.
This workflow of cloning an existing working git repository is not best practice with git, which is why it gives this strange behaviour.
The best practice is to create a "bare" git repository for your remote. This is a repository for keeping a master copy of all the source history, but does not have a working directory.
All working copies of your project should use this bare repository as its remote repository. They all push and fetch from the bare, and any conflicts that occur can be resolved when pushing or fetching from the shared location.
In a bare repository you will not see your files, but a file structure like this:
If you open the ".git" folder in a working repository you will see the same files. These contain all the source control changes and history.
In Simulink Project it is possible to create a bare repository and a working copy at the same time:
1. In the HOME ribbon select New > Simulink Project > From Source Control
2. When setting the repository path, click the "Change..." button.
3. In the "Select A Repository" Window that opens click the + button and select a folder for keeping the bare repository in.
4. Click Retrieve and then "Yes" when it asks if you want to create a new project.
5. Click "Create" to create the project.
This will create a bare repository in the folder selected in step 3, and a working copy of the bare repository wherever you created the simulink project.
If you want to create more working copies of your project, you should set the repository path to be the bare repository. All the working copies will consequently push and fetch changes to/from the bare repository. This is the standard workflow with git.
The message "Unable to perform non fast forward merge on target. Please pull or fetch and merge manually" usually means that your origin branch is not up to date; or in other words, someone else has submitted to the remote repository since you created your repository and you are not up to date. You need to push the fetch button to update your origin branch and then merge the origin branch into your local branch.
For instance if you are on the master branch, push fetch, open the branch manager, select origin/master and select merge. Then you need to resolve any conflicts and perform a commit. You might not have any conflicts, but if you do they need resolving.
Once you have done this you will be able to do a push.
Related Question
- How to restore a deleted, source controlled file from SimulinkProject
- R2018a GLException error on linux
- How to create a Simulink Project under Source Control (Git) and upload it on a remote repository (GitHub)
- How to commit changes to a Matlab submodule
- Simulink Project Cloned Repository not keeping configuration
Best Answer