Hi guys,

I'm having an issue.
I tried to sketch it in an image:

<https://lh5.googleusercontent.com/-RUdvDst8mvk/VOcckjwHwCI/AAAAAAAAAOg/EVb6xru4Vm0/s1600/git.issue.png>

So the issue is that files I no longer want to track on my local branches 
are being deleted on my remote repo (origin).

Anyone who knows how to solve this?

By the way, when returning the second time to my master branch I have to 
use git rm --cached because otherwise the merge would also delete /files 
and index.php from my master branch. I was hoping that my global .gitignore 
would solve this but this does not help, even though /files and index.php 
are in the global .gitignore... So it stays on my local master branch but 
when pushing any changes to the origin repo (remote repo on bitbucket) they 
are deleted from remote.

Thanks!

David

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to