m-git | based multi-warehouse management tool | Version Control System library

Listing the most recent tag of a remote repository produces a different answer from cloning that repository and then describing its tags. E.g.

it seems like a similar question with Untrack files from git temporarily but I can't find a good-working answer for me.

I'm running a python-django server and have trouble on git merge.

At the beginning of the project, a developer had committed all the *.pyc files on git, and these commits are used on the server as production code.

Now I have removed all the *.pyc files from the repository and make the proper .gitignore file.

But the problem occurs here.

Everything goes well till commit, but if I tried to merge it with production code, it emits an error.

Your local changes to the following files would be overwritten by merge:

Of course, the troubled files are the *.pyc files.

I assume it's because the *.pyc files are already tracked in some commits, and when trying to merge, git judge that the local *.pyc files will be removed by the commits which have 'delete: *.pyc' internally.

Describe it as an example :

Let's say I'm on branch A and want to merge branch B to branch A. The top commit of branch B has no *.pyc file. And the top commit of branch A has *pyc files on the working tree, but they're already removed from index(stage) by git rm --cached. When I try git merge B on branch A the error Your local changes to the following files would be overwritten by merge: occurs.

Is there any feature to resolve it in git?

P.S.: I'm new in StackOverflow and not fluent in English. If I made any mistake on this question or some phrases are hard to understand, please comment on me. Thank you.

Add git-status:

I can't upload the output with real file names, but it seems like below. Just the file names differ.

I'm trying to use the code from this repository. The problem is that it isn't a package (I think?) because it can't be found on PyPI and there's no setup.py file (so I can't use pip install git+). How would I then be able to use this code in my project?

I've already read this question, which also involved not having a setup.py file, but the answer seems unsatisfactory to me. I'm under the impression that it wouldn't allow my project to be run on someone else's pc without them also manually installing the code from the aforementioned repo.

I've also thought about just downloading the code and adding a setup.py myself, but I think that would produce the same problem.

I'm clearly a little unclear on this subject and I can't find any explanation/solution anywhere else.

I'm running the latest Git For Windows 2.29.2 and for me credential.helper is set to manager-core by default. I did confirm that running git config --system list.

My Git installation shows it has two credential helpers

1. Git Credential Manager for Windows (earlier helper which is deprecated in newer version of Git) and,
2. Git Credential Manager Core (default helper in newer versions of Git)

Running version command for both in git terminal confirm their presence :

After I enter the clone url it appears a login screen entering the login name and password.

However, I wonder I type them wrongly, I failed to clone the repository. Then, no matter I retry to clone or even I reinstall Sourcetree, it gives me error when trying to clone:

I'm trying to clean up a git repository of latex code that contains the generated pdf files, because these files have caused the repo to balloon up to a size of 300mb.

Adapting a bit from the answer here How to remove file from Git history?. I tried the following command:

git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch *.pdf' HEAD

This reduced the size a little, but not as much as i'd hoped. When I then try the script found in the answer to this question: How to find/identify large commits in git history?, to find which files contribute to the size, it still shows several pdf files. However, if i try the script found in this question: Which commit has this blob?, it cannot find any commit that contains the file.

I have removed all branches except the local branch. I have not pushed the changes to the remote.

Is there any reason these files would still persist in the history somewhere? What other things can I try?

I am trying to push changes to my repository:

I've made changes in a project in Visual Studio and committed them. It's connected to my GitHub repository. Now, I haven't pushed it, because it won't work. After further investigation, I found that I accidentally added a huge file in my commit, which Visual Studio now tries to push up to my GitHub Repo. But since it's such a huge file, it won't be uploaded and I dont know how to delete it from that commit.

So I would like to know: How to access and modify/delete files from a non-pushed commit in Visual Studio?

And if that is not an option, how should I proceed otherwise? I already made more changes in the project, so I maybe have to do a rebase or something?

I found other threads, but those we're about changing the message, not the files themself, or they were about an already pushed commit.

Any help is appreciated!

This is a follow-up to this question.

I want to install and use a Python package/library that I created in a git repo. It gets installed and I can access it, BUT: Only the Python file at the package's top level is installed in /Lib/site-packages. There are subfolders in the git repo, but I don't see them in my site-packages and when I try to access them I get ModuleNotFoundError: No module named '.'.

How can I install ALL CONTENT of my library?

I tried using wheel and setup.py. This is supposed to mean that I included both a wheel and a tar.gz in my repo and I installed it without having package wheel installed and with having package wheel installed. Result is the same.