nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Add/remove question

kevnm67

I cant upload my project to github because of a large file, which ive ignored and removed from the cache. Not sure what im missing... Will add/remove remove the large files I have in git ignore? Or if you have any advice as to how I can fix this issue I would greatly appreciate the help.

Accepted answers

KieranA

Hi Kevin,

If it's already added then it'd stay there. Your ignore list is just so unstaged files in your working copy aren't listed. So "git add ." wouldn't pick up on the ignored files, for example, and they wouldn't display if you did "git status" either. Already added files won't be removed from your index or repository as there might be files which are an exception to the rule which you explicitly want in your repository.

What you'd need to do is remove the large files explicitly even after you've added it to your ignore list. If you go to the "File Status" view (if you're on Windows I assume there's an equivalent) and make sure you "Show All" files and right-click on the file you no longer want there then you can either hit "Stop Tracking" to remove it from the index but keep the file or you can "Remove" it which will delete the file and remove it from the index.

Hope that helps

All comments

KieranA

Hi Kevin,

Hope that helps

kevnm67

Thanks for the explanation!

Im trying your suggestion now but I cant even find the file that's preventing the upload to github. It's in working copy with the "Show all" button selected. Any ideas? (and im on mac, by the way)

kevnm67

Thanks for the explanation!

Im trying your suggestion now but I cant even find the file that's preventing the upload to github. It's in working copy with the "Show all" button selected. Any ideas? (and im on mac, by the way)

KieranA

Here's an example:

If it's not shown there then it's probably not in your repository, or perhaps you haven't pulled the latest changes if it was committed from elsewhere.

KieranA

And it's untracked and on your ignore list it won't appear at all, FYI.

KieranA

So what interactive rebase does is rewind to the specified commit (if none specified then it's from the last upstream commit). Imagine it to be like taking each commit from the most recent to the specified commit and putting them onto a stack (First In Last Out). Then you pop each 'commit' (changeset) off the stack and perform the specified action with them. That's what interactive rebase does.

Sorry, 'Edit' was the old naming, the new naming is 'Amend commit?'. You need to check the checkbox next to each entry that would contain the psd files you want to get rid of.

So what happens is say you have commits A, B, C, D, E, F where F is the most recent commit. Now say C and D have the PSD files in them, you'd right click on commit B and hit 'interactive rebase' (provided none of these commits have been pushed) where you're presented something similar to the following (although with less commits)

When you hit "OK" on the interactive rebase sheet it will go to the commit you've hit 'Amend commit' on and stop. At this point the top line of your log will have a tag "HEAD" on it. Now you can right click on the file and remove it.

Because you've added the file at one point, then edited it at another it means you'll get a merge conflict. Whether you resolve using theirs or mine doesn't matter, what matters is that you make sure it's removed again from the next point. Remember that when you hit commit after you've removed it what's actually happening is that the rebase process is continuing. So let me do a test case for you as follows.

You have a bunch of commits and you want to rebase interactively from the commit before you added the file as follows:

Now make sure you click the 'Amend commit' checkbox next to the commits which have that file (or multiple files) in them as follows:

When you hit OK it will now go through each of those commits listed in that dialog and do whatever action is necessary (if any at all). So in the above examples it will stop and the latter two commits (remember it's going in reverse order, so 8dec6bd is the first commit that it will stop at). At this point SourceTree will present you with the log view but the top commit will have a "HEAD" tag on the top-most commit. This is the commit it has stopped at for you to edit.

Now you can start making changes, so move the PSD file somewhere else and hit 'Commit'. Do note when you remove the file the log view won't show changes to your working copy. Make sure you drag the missing file to the staged area as shown below:

Hit commit and this causes the interactive rebase to continue (hence why 'Amend latest commit' is forcefully checked). [Note that if you get an error because it was the only file committed then follow the instructions from the output, namely issuing the command "git reset HEAD^" at the terminal].

Now you should get a merge conflict because you've edited a file which doesn't exist in the repository as it wasn't added. You'll get a warning saying you're in a merge conflict, but your repository should look something like this:

Right click on it and click "Remove" which will remove it from the commit. Hit 'Commit' again and make the commit. It will continue with the rebase and finish off and leave the repository in the same state just without that particular file like so:

Notice that the commit SHAs have changed because it rewound and reapplied the commits, so they are entirely new commits now which is why you should never do an interactive rebase on already pushed commits.

Hope that all makes sense and helps.

kevnm67

Thank you! I really appreciate the details and screen shots, which are very helpful. Ill try this now and let you know how it goes.