git工作流程进行修改你永远不会推回原点 [英] git workflow for making modifications you'll never push back to origin

问题描述

Git newbie here。

Git newbie here.

我使用构建iPhone应用程序PhoneGap ，它有一个Git仓库。我想跟踪自己在Git仓库中对PhoneGap代码的更改（主要是将文件添加到www目录），同时能够从PhoneGap中获取最新最好的内容。

I'm building an iPhone app with PhoneGap, which has a Git repos. I'd like to keep track of my changes to the PhoneGap code (mainly, adding files to the www directory) in my own Git repository, while being able to pull the latest and greatest out of PhoneGap.

这样做的最好方法是什么？这是一个分支的目的是什么？

What's the best way of doing this? Is this what a branch is intended for?

另外，我怎么会忽略这个事实，我删除了我不需要的文件夹，如android /和黑莓/文件夹？

Also, how would I get it to ignore the fact that I deleted folders I don't need, like the android/ and blackberry/ folder?

推荐答案

这正是分支的目的。你应该在你的分支上工作，并从主分支中提取更改，可能使用 - rebase 。

This is exactly what a branch is for. You should work on your branch, and pull changes from the main branch, possibly using --rebase.

这篇关于git工作流程进行修改你永远不会推回原点的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！