[dgplug-users] [Fedora offline repo] @Ratnadeep Debnath

[Shakthi Kannan]

Hi,

--- On Fri, Oct 9, 2009 at 7:43 AM, Ratnadeep Debnath <rtnpro at gmail.com> wrote:
| I just did
| git rm <files>
| git clean -f <path to not tracked in index>
\--

Why "git clean -f"? Just 'git rm' and a commit should have removed the files.

If I try to merge your code with the current shakthimaans-clone [1],
it isn't merging cleanly. I use (for example):

  $ git clone git://gitorious.org/~shakthimaan/fedx/shakthimaans-clone.git
  $ cd shakthimaans-clone.git
  $ git remote add rtnpro
git://gitorious.org/~rtnpro/fedx/rtnpros-fedx-clone.git
  $ git fetch rtnpro
  $ git checkout -b rtnpro-review rtnpro/master
  $ git checkout master
  $ git checkout -b testing
  $ git merge rtnpro-review

It is still showing the grsync files. While Makefile gets updated,
README doesn't.

SK

[1] http://gitorious.org/~shakthimaan/fedx/shakthimaans-clone

-- 
Shakthi Kannan
http://www.shakthimaan.com