首页 \ 问答 \ Github拉忽略特定文件(Github Pull Ignore Specific File)

Github拉忽略特定文件(Github Pull Ignore Specific File)

在我的GitHub回购中,我有一个文件www / settings.js,这是存储自定义设置的地方。 我将此文件添加到.gitignore但尝试在本地存储库上提交更改时仍然出现错误:

Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
    (use "git pull" to update your local branch)

Changes not staged for commit:
    modified:   www/index.html
    modified:   www/settings.js

no changes added to commit

如何防止git尝试在本地保持www / settings.js最新?


In my GitHub repo I have a file www/settings.js which is where custom settings are stored. I added this file to .gitignore but I'm still getting an error when attempting to commit changes on my local repo:

Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
    (use "git pull" to update your local branch)

Changes not staged for commit:
    modified:   www/index.html
    modified:   www/settings.js

no changes added to commit

How do I prevent git from attempting to keep www/settings.js up to date locally?


原文:https://stackoverflow.com/questions/24743622
更新时间:2020-03-23 22:26

最满意答案

这意味着此文件已经提交到您的仓库,您将需要:

  1. 重写您的Git历史记录,以删除现有的任何痕迹。
  2. 删除文件并继续。

在任何一种情况下,您都需要在继续之前备份另一个位置的文件内容。 以下是每种情况的说明:

重写历史

cp www/settings.py www/settings.py.backup
git filter-branch --index-filter 'git rm --cached --ignore-unmatch www/settings.js' HEAD

# Copy the original file back
mv www/settings.py.backup www/settings.py

这将从您对repo所做的任何提交中删除文件的所有痕迹。

删除文件

cp www/settings.py www/settings.py.backup
git rm --cached www/settings.py

# Commit the change
git ci

# Copy the original file back
mv www/settings.py.backup www/settings.py

This means that this file has already been committed to your repo, and you're going to need to either:

  1. Rewrite your Git history as to remove any traces of it existing.
  2. Delete the file and continue.

In either case, you will need to back up the contents of the file in another location before continuing. Here are the instructions for each case:

Rewrite History

cp www/settings.py www/settings.py.backup
git filter-branch --index-filter 'git rm --cached --ignore-unmatch www/settings.js' HEAD

# Copy the original file back
mv www/settings.py.backup www/settings.py

This will remove all traces of the file from any commit you've made to the repo.

Delete the File

cp www/settings.py www/settings.py.backup
git rm --cached www/settings.py

# Commit the change
git ci

# Copy the original file back
mv www/settings.py.backup www/settings.py
2014-07-14

相关文章

更多

最新问答

更多
  • 如何避免MDIParent表单调整大小(How do I avoid MDIParent form from resizing)
  • Angular自定义指令调用另一个自定义指令(Angular custom directive calling another custom directive)
  • 如何通过参数将文本解析并附加到SQL Server 2005中的存储过程(How to Parse and Append text to a stored procedure in SQL Server 2005 via a parameter)
  • OpenCV中心Homography(OpenCV Center Homography)
  • 如何在linux shell脚本中计算日期-N?(How to calculate date -N in linux shell scripting?)
  • 如何使用Devise创建用户配置文件?(How Do I Create a User Profile With Devise?)
  • 清理模式以管理树上的多步异步过程(Clean pattern to manage multi-step async processes on a tree)
  • 场景的角色(Role of the Scene)
  • 组件中的Angular 2组件[重复](Angular 2 Component In Component [duplicate])
  • jsPlumb draggable element javascript函数(jsPlumb draggable element javascript function)
  • MVC4:ViewModel(带有radiobuttonlist)在HttpPost之后为空(MVC4: ViewModel (with radiobuttonlist) is empty after HttpPost)
  • 如何在同一帐户上设置“Dev repo”(在prod和团队之间)(How to set up a “Dev repo” (between the prod and the team) on the same account)
  • 如何在tcl中将eth0配置为发送方udp端口(how to configure eth0 as a sender udp port in tcl)
  • 如何使用预定义文本替换来自数据库的部分结果(How do I replace part of result coming from Database with predefined text)
  • Selenium Java注入了新的Javascript函数(Selenium Java inject new Javascript function)
  • 使用.on的多个下拉菜单选择文本仅适用于第一个下拉列表(Multiple Dropdowns Menu Selection text using .on works only on first dropdown)
  • 快速将黄土曲线添加到大型数据集图中的方法(Quick way to add loess curve to large data set graph)
  • FilteringSelect in mvc(FilteringSelect in mvc)
  • 在Delphi XE2中开发Mac或iOS应用程序需要哪些硬件/软件?(What hardware/software is necessary to develop Mac or iOS apps in Delphi XE2?)
  • 在原型的构造函数中初始化属性时获取“未定义”(Getting 'undefined' when a property is initialized in the constructor of a prototype)
  • 通过越狱加载的应用程序的Documents文件夹位置(Location of Documents folder for an app loaded via jailbreak)
  • 在OpenGL中使用可编程和固定管道功能(Using both programmable and fixed pipeline functionality in OpenGL)
  • 将任何用户输入重定向到单独的底层程序(redirect any user input to a separate underlying program)
  • 编辑文本不能正常工作android(Edit texts not working properly android)
  • “user_denied”Facebook应用页面上的Facebook用户区域设置(Facebook user locale on “user_denied” facebook app page)
  • 在大图像中找到小的部分透明图像的坐标(find coordinates of small partially-transparent image within a large image)
  • 我如何在cakephp 3.1中获得完整的相对路径?(How i can get full relative path of image in cakephp 3.1?)
  • 如何保存拖动标记的新本地化?(How to save new localization of dragged marker?)
  • MySQL UPDATE vs INSERT和DELETE(MySQL UPDATE vs INSERT and DELETE)
  • 在执行查询之前,在SQLAlchemy模型中将datetime转换为unix时间戳?(Convert datetime to unix timestamp in SQLAlchemy model before executing query?)