Search Results

Search found 13214 results on 529 pages for 'git config'.

Page 76/529 | < Previous Page | 72 73 74 75 76 77 78 79 80 81 82 83  | Next Page >

  • Should I merge .pbxproj files with git using merge=union?

    - by Ortwin Gentz
    I'm wondering whether the merge=union option in .gitattributes makes sense for .pbxproj files. The manpage states for this option: Run 3-way file level merge for text files, but take lines from both versions, instead of leaving conflict markers. This tends to leave the added lines in the resulting file in random order and the user should verify the result. Normally, this should be fine for the 90% case of adding files to the project. Does anybody have experience with this?

    Read the article

  • Git: Is there a way to figure out where a commit was cherry-pick'ed from?

    - by EricSchaefer
    If I cherry-pick from multiple branches, is there a simple way to figure out where the commit was coming from (e.g. the sha of the original commit)? Example: - at master branch - cherry pick commit A from a dev branch - A becomes D at the master branch Before: * B (master) Feature Y | * C (dev) Feature Z | * A Feature X |/ * 3 * 2 * 1 After: * D (master) Feature X * B Feature Y | * C (dev) Feature Z | * A Feature X |/ * 3 * 2 * 1 Is it possible to figure out that B was cherry-picked from A (aside from searching for the commit message)?

    Read the article

  • Git: Stage into Commit, what is the right workflow?

    - by Lukasz Lew
    I just created a big piece of code I want to commit in several separate commits. So I can stage relevant parts, commit, stage, commit, ... and so on until I have all my changes commited. The missing part is how can I test whether I split the commit correcty. I.e. whether the part that is in staging area at least compiles? To do that I must somehow bring my work tree to be in sync with index (staging area) without losing the changes to be committed later. What is the right way to do it? What is the quickest way to do it? Update: How to do it with magit?

    Read the article

  • One configuration per domain name on the same application. How to easily access config values from m

    - by Aymeric
    Hi, I run a Ruby on Rails website that have multiple domain names. I have a "Website" table in the database that stores the configuration values related to each domain name: Website - domain - name - tagline - admin_email - etc... At the moment, I load the website object at the start of each request (before_filter) in my ApplicationController: @website = Website.find_by_domain(request.host) The problem is when I need to access the @website object from my models methods. I would like to avoid to have to pass @website everywhere. The best solution would be to have something similar to APP_CONFIG but per domain name. def sample_model_property - - "#{@website.name} is a great website!" end How would you do it?

    Read the article

  • What are the advantages of a rebase over a merge in git?

    - by eSKay
    In this article, the author explains rebasing with this diagram: Rebase: If you have not yet published your branch, or have clearly communicated that others should not base their work on it, you have an alternative. You can rebase your branch, where instead of merging, your commit is replaced by another commit with a different parent, and your branch is moved there. while a normal merge would have looked like this: So, if you rebase, you are just losing a history state (which would be garbage collected sometime in the future). So, why would someone want to do a rebase at all? What am I missing here?

    Read the article

  • How can I specify a single .config file for multiple EXE projects in .NET

    - by Russ
    I have a project that I am breaking up into multiple .exe projects. I still plan on publishing them, using click once, into the same location at the same time, and I would like to use the same config file. I have added the app.config to each project using the "Add link" option in Visual Studio, which is great for debugging, but in production, when I compile each exe project, the app.config is not copied into the "master project"'s bin folder. example: master.exe with master.exe.config master.exe may launch order.exe based on user settings master.exe may launch returns.exe based on user settings master, order, and returns will all reside in the same folder, and should share a single config file.

    Read the article

  • How to build SVN/Git like Diff in WebApp?

    - by 01
    I have XMLs(or Objects) that represents data at some point in a business process. I would like to be able to see what has changed between step1 and step5(two versions of the same XML or Object). Id like to implement this like diff function in version control system. how to do it in web app? P.S. I dont want to just store those files in VCS and than make it do the diff. However if I could somehow emulate VCS without having one that would be cool. P.S. I know there are some JS frameworks that offer diff functionality, but the XML could have 10MB, so I think it should be dont at server side.

    Read the article

  • How Does the VS 2010 web.config work?

    - by chobo2
    Hi I am just wondering in VS2010 the web.config is broken up into web.config web.debug.config web.release.config So from what I gathered is the web.config is just like the master template. So I am guessing in my debug I could put things like my local database where in my release one I would put my server database. Now how does it know when to use the release version or debug version? I also here that you can have more than 2. How does that work?

    Read the article

  • Few files out of sync but GIT doesn't seem to notice.

    - by doublejosh
    I have two repos that claim to be clean. One was originally cloned from the other and is used for dev work. There are a few files that I can see are not the same. However when I try pulling either way it says everything is up to date. How is this possible? Did that file miss a commit somehow? ...but shouldn't the difference be noticed regardless? Do I need a refresh of some sort?

    Read the article

  • can the web.config be changed so roles wouldn't work any more?

    - by Scott J.
    I have had two instances of this problem, first on my local computer, now on the main site. Users can log in to the site, but it doesn't seem to recognize their roles. When I log in (which the database still recognizes as having the role admin), the code does not recognize it as being in the admin role. If there are other web.configs in subfolders, would that cause the problem? What could possibly cause this issue? Thanks! scojomodena

    Read the article

  • IIS redirects to url beginning with "http://http" although syntax in web.config file appears to be alright

    - by user1608920
    Here's what I have so far: <?xml version="1.0" encoding="UTF-8"?> <configuration> <location path="osb"> <system.webServer> <httpRedirect enabled="true" exactDestination="true" destination="http://50.63.54.135/app/osb" httpResponseStatus="Permanent" /> </system.webServer> </location> </configuration> The above redirect works, but it takes me to http://http//50.63.54.135/app/osb instead of just http://50.63.54.135/app/osb This produces an 404 error. I tried to remove "http://" from destination. Same effect. What am I missing ?

    Read the article

  • How to change a remote repository URI using Git?

    - by e-satis
    I have a repo (origin) on an USB key that I cloned on my hardrive (local). I moved "origin" to a NAS and I successfully tested cloning it from here. I would like to know if I can change the uri of "origin" in the settings of "local" so it now pull from the NAS, and not from the USB key. For now, I can see two solutions : - pushing everything to the usb-orign, and copy it to the NAS again (implies a lot of work due to new commits to nas-origin); - adding a new remote to "local" and delete the old one (i fear I'll break my historic).

    Read the article

  • method to change apache config via the shell with whm/cpanel

    - by Chiggsy
    How can I make changes to the apache config on a whm/cpanel setup from the shell and have them integrate properly? I read the theory of the config system and regardless of my feelings on the matter I understand where they are coming from. Still, in that world view, there must be a way to interact with the system from a command line interface, right?

    Read the article

  • Config files for xterm

    - by petersohn
    Is there any config files for xterm for default settings? For example, on my system, xterm start with black text on white background, and I want it the other way around. I can do it by starting it with: xterm -bg black -fg white. I want to set in a config file that if I run it without arguments, it will start with these options.

    Read the article

  • SCCM: Manage Network Config Baseline

    - by Malnizzle
    I'm new to SCCM and trying to figure out the best way to do things. I want to create a config baseline for defining network settings (e.g. default gateway) for a collection of servers. Is finding the applicable reg key and deploying the config that way the best method, or is there a configuration pack that includes pre-determined values, maybe a third option I am un-aware of? Thank you!

    Read the article

  • gSoap not working with correct pkg-config

    - by O.O
    I run: soapcpp2 myClass.hpp -dsoap and get this error: Package gsoap++ was not found in the pkg-config search path. Perhaps you should add the directory containing `gsoap++.pc' to the PKG_CONFIG_PATH environment variable No package 'gsoap++' found Package gsoap++ was not found in the pkg-config search path. Perhaps you should add the directory containing `gsoap++.pc' to the PKG_CONFIG_PATH environment variable No package 'gsoap++' found The path is set... $ echo $PKG_CONFIG_PATH :/home/someUser/SOAP/gsoap-2.8/:/home/someUser/SOAP/gsoap-2.8/

    Read the article

< Previous Page | 72 73 74 75 76 77 78 79 80 81 82 83  | Next Page >