Hi Everyone
I am using BBedit since many years, but not expert in the expert
features.. fairly new to using git.. (but enjoying, albeit over my
head a bit).. and I only last week starting using projects. I love it
because I see all the files in the (sub)directory(ies) and also have
that handy list of just the open files.. etc. :-) Now my issue is
that when I checkout a branch in git, do some work, commit, and then
try to merge that dev branch back onto the master branch, I get this
error in git:
error: Your local changes to the following files would be overwritten
by checkout:
myDir1/myDir2.bbprojectd/Govind.bbprojectsettings
Please, commit your changes or stash them before you can switch
branches.
Aborting
I was about to simply tell git to ignore that file, using
the .gitignore file.. BUT I suddenly realize I am perhaps in over my
head. If I merge code/files, but do not allow BBedit to play with the
state of things.. then am I asking for trouble.. with regards to how
the project is going to behave in Bbedit?
Please advise. I am not sure I even know what questions I should be
asking, other than, "am I on the right track to just tell git to
ignore the 'myDir1/myDir2.bbprojectd/Govind.bbprojectsettings'
file?"
Thanks
-Govinda
--
You received this message because you are subscribed to the
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
<http://groups.google.com/group/bbedit?hl=en>
If you have a feature request or would like to report a problem,
please email "supp...@barebones.com" rather than posting to the group.
Follow @bbedit on Twitter: <http://www.twitter.com/bbedit>
