Search Results

Search found 3 results on 1 pages for 'emostar'.

Page 1/1 | 1 

• How to use git to manage one codebase but have different environments

  - by emostar

  I'm using git for a personal project at the moment and have run into a problem of having one codebase for two different environments and was wondering what the cleanest way to use git would be. Main Desktop I Use this machine for most of my development. I have a git repository here that I cloned off of an empty repository that I use on my internal server. I do most of my work here and push back to the internal server so I can use that as a master of truth and to ease making backups. Laptop I sometimes want to code on the road, so I did a clone from the internal server and created a new branch called "laptop-branch". Unfortunately some directories MSVC++ version are different than from the Main Desktop environment. I just modified the files in the "laptop-branch" and committed them there. Now I did a lot of changes while on vacation with my laptop, and want to push them to origin, but don't want the changes I made that were related to directories and compiler versions to be pushed back to origin. What would be the best way to get this done?

  Read the article

• Extracting fixture for one specific object

  - by emostar

  I want to extract the necessary code to recreate a set of Models from my production environment to my testing environment. There is something wrong in the data that causes an Exception, and I need the data in my local environment to do debugging. I looked at django-extensions and the dumpscript command is almost what I want. But I have many other objects connected to this one via foreign keys. Is there an easy way to extract the object by primary key, and all other objects that are related to it?

  Read the article

• How to use git to manage one codebase but have different environments

  - by emostar

  I'm using git for a personal project at the moment and have run into a problem of having one codebase for two different environments and was wondering what the cleanest way to use git would be. Main Desktop I Use this machine for most of my development. I have a git repository here that I cloned off of an empty repository that I use on my internal server. I do most of my work here and push back to the internal server so I can use that as a master of truth and to ease making backups. Laptop I sometimes want to code on the road, so I did a clone from the internal server and created a new branch called "laptop-branch". Unfortunately some directories MSVC++ version are different than from the Main Desktop environment. I just modified the files in the "laptop-branch" and committed them there. Now I did a lot of changes while on vacation with my laptop, and want to push them to origin, but don't want the changes I made that were related to directories and compiler versions to be pushed back to origin. What would be the best way to get this done?

  Read the article

1