For this, reset your local master branch on commit C (with drag&drop, as I told earlier) and push it. If you are sure that the only persons that have this repo cloned is you and your colleague, you may rewrite the remote log. So the simple answer is you cannot revert the repo to the commit C as you want, because it may conflict with repos cloned on other machines. If you cannot tell for sure, you cannot reset branch from a published commit without danger of breaking someone's copy of the repo. anyone may have it pulled on their machine. But you should be very careful with it, because it points on a commit B, which is published. Strictly speaking, you may do the same trick with your origin/master branch, you may reset it to any other commit. reset it to commit B, where origin/master is pointing to, and you will no longer see this commit in your log, because there is no branch from which it can be reached. In SmartGit to do this, just click down on that green branch label and drag it to any other commit. You can reset this branch to whatever commit you like. You continue to see commit A, because you have a branch pointing on it. In your situation you have to take into account several GIT features: SmartGit is merely a client, though very convenient and fully featured. What you are asking is not specific to SmartGit, but to GIT in general. Is there something else i have to do in order to update all my folders when another user do a commit besides PULL ? Im pretty new to SmartGit and is kinda of confusing everytime im trying to do a clean pull. What i want to do is delete the first two commits from the log and return to the "Cambios Varios" commit (the one with the green arrow that btw appeared when i was trying to check out that commit).Īll this mess was because my coleague made some changes and add a file and then commit his changes, in order to have my files updated i made a pull but my files didn't get updated on my local repository and didnt add the file that was added by my coleague. I have also try to revert the commit that i made by mistake but i still see the commit on the log. I have been trying to checkout the commit that i want to return to but Smartgit ask me to create a local branch in order to do this (screen shot attached) and since im not an expert with SG i really need some advice. Your non-commercial license will work with these products out-of-the-box.By mistake i have made a commit that now i want to delete from the history log and return to a previous commit. We have applied the same licensing changes for SmartSVN 14.3 and SmartSynchronize 4.4. For a B2B-product in the Software industry, this is in stark contrast with the overall number of Software developers compared to the number of primary open source developers and academic users □ SmartSVN and SmartSynchronize We have decided to take this step, because the current proportion of non-commercial users is above 60%. The new licensing conditions are now enforced by requiring a non-commercial license. Technically enforced licensing conditions hobby users, with certain limitations on the repositories requires version 23.1 preview, see also this blog post.employees of companies for whom the company owns a valid SmartGit license.employees or students on public academic institutions (before, it was only “for learning or teaching on a public academic institution”).everyone who spends the majority of their work on open-source projects (before, it was only “to actively work on open-source projects”, which is significantly more restrictive).For SmartGit 22.1, we have changed the non-commercial licensing conditions to be more permissive overall.
0 Comments
Leave a Reply. |