‫In the previous video, we have committed by mistake these fouler so what we can do, well, as long
‫as we didn't push to the server, we can alter the entire history so we can merge, we can amend it,
‫and it will be safely as long as it is pushed.
‫So let's consider.
‫I want to delete this now.
‫First, I want to make sure that my latest comment includes to add this configuration from the list
‫folder and it's exactly what it is.
‫So add the data folder to ignore it.
‫I'm going to do that.
‫So how do I safely remove something from the repository?
‫Well, you just go right click the target and you have two options.
‫You can either delete or delete and keep local.
‫If you just go here, delete and keep local, you will delete from the version history.
‫But the file will still keep being locally and you light and you want to do that this file with a dot
‫there specific to the current user.
‫So you want to delete from the history.
‫But you want to keep it locally, do you want to remove from the index, from the index, it means from
‫the history, from the change tracking history.
‫So let's remove one file has been removed and again, the folder has been changed.
‫So if I go here to commit.
‫I can see that this file has been deleted, however, if I go to the actual folder, this file, it
‫still exists.
‫OK, so it exists because we have the choosing to keep Lochley.
‫If you just.
‫Choose this option, it will delete from the folder and from the history, so from the both files,
‫but if you just use the delete from your keyboard, it will only delete from the disk and it will still
‫be kept in the repository.
‫However, as long as there is this green or at least this file, it's been checked.
‫OK, so it is in the repo.
‫Great, now, if I'm going to commit and I see this, this is a folder I'm going to check Ammend last
‫commit.
‫I don't see anything related to my file, so you cannot do an amend if you have added and if you have
‫deleted.
‫So theoretically, these two should be canceled and they only modify file.
‫Is this ignore?
‫So even if I have deleted from my history here and I'm going to amend now, it will not delete from
‫this folder and you can see you actually commit.
‫And he'd close these it's still here, this is still change.
‫So how you can reverse this?
‫Well, because we didn't push yet.
‫I'm going to show you another technique, so I'll go here.
‫And let's delete and keep local.
‫Remove.
‫And let's give another commit, so let's commit, let's say, Lilit.
‫From local radio.
‫And he'd commit.
‫Now, I'm not going to push, but if I go here in the Target and Sherlock and by the way, this second
‫disappeared, so there is no this folder is not keep tracking.
‫I can see that the data folder it's in or has been added and I have another committee which has been
‫deleted.
‫Well, how you can avoid this mistake, because these two, they're not pushed to the server.
‫I can just select them.
‫Right.
‫Click and I'm going to use these combine to one commit hit, OK?
‫And I'm just going to keep this message at Datafolha trainer and he commit.
‫OK, I'm going to close.
‫So if I go here to the ad Datafolha to ignore these two comments have been merged and now I cannot see
‫anything related to my TMB message.
‫Now now I can safely push this change to the remote server.
‫But keep in mind, as long as you push, you cannot either amend to commit and you cannot use this trick
‫to merge.
‫So I can go to, let's say, much to or actually you merge three committees.
‫You can combine locally, but I don't recommend to do that, don't do that because we have already pushed
‫weight.
‫So this is how they lead and how do you merge?
‫Now, this option at the march is not available in the studio, so that's why I encourage you to install
‫it to Tasket.
‫You can still delete, um, files.
‫So there is still this ability to do that, but not this kind of level.
‫The integration from the upper studio, it's still limited or at least at the moment of my recording.
‫So let's go to the next part.