Search Results

Search found 4369 results on 175 pages for 'merge tracking'.

Page 99/175 | < Previous Page | 95 96 97 98 99 100 101 102 103 104 105 106  | Next Page >

  • Error when doing git pull, unable to resolve

    - by nubela
    Hi, I'm getting this git error and I don't really get what it means, nor how I can fix it: (v_env)[nubela@nubela-desktop searchplus]$ git pull origin master From file:///home/nubela/Workspace/_git/searchplus * branch master -> FETCH_HEAD Updating 38f3d5b..fe6028c error: Untracked working tree file 'searchplus/.project' would be overwritten by merge. Aborting (v_env)[nubela@nubela-desktop searchplus]$ I've done the following but to no avail: git clean -f -d git reset --hard HEAD Anyone can help enlighten me? Thanks :)

    Read the article

  • Storage location of yellow-blue shield icon

    - by gencha
    Where, in Windows, is this icon stored? I need to use it in a TaskDialog emulation for XP and am having a hard time tracking it down. It's not in shell32.dll, explorer.exe, ieframe.dll or wmploc.dll (as these contain a lot of icons commonly used in Windows).

    Read the article

  • What characters are allowed in ClearCase activity name?

    - by Dmitry
    I want to write script for internal issue tracking system, integrated with ClearCase, that checks activity name (typed by user) for illegal characters. Unfortunatly, I can't find list of characters, allowed by ClearCase. Does anybody know where to get it? UPD: I'm looking for a link to a document, that specifies the allowed characters (or says that all characters are allowed).

    Read the article

  • Whats a good E-Commerce Cart

    - by s32ialx
    Whats a good Shopping Cart possibly free i know there oscommerce, xcart etc but whats a good one? and fairly easily to implement maintain and edit possibly merge with in my sites current theme. If you mean technology as in web language which I hope you do than it's php. other then that i have no clue what you mean apache/mysql? amd? lol

    Read the article

  • Rails engines extending functionality

    - by sinsiliux
    So I have an engine which defines some models and controllers. I want to be able to extend functionality of some models/controllers in my application (eg. adding methods) without loosing the original model/controller functionality from engine. Everywhere I read that you simply need to define controller with the same name in your application and Rails will automatically merge them, however it doesn't work for me and controller in engine is simply ignored (I don't think it's even loaded).

    Read the article

  • ASP.NET Writing to the Bin directory, access denied when anonymous user

    - by LeeW
    Hi all I have a program that creates a small file in the Bin directory for the purpose of tracking a license (that's the intention), all works fine when debugging but I've just realized that when I run it on a IIS server under the anonymous user account (IUSR) the file isn't created as IUSR only has read permission (I know this is correct but drat!). Can I write to another location under IUSR account or can I run my code under 'Local Service' account? Thanks

    Read the article

  • Creating a handle to a class' property

    - by shadeMe
    Would it be possible to create a handle ( or a tracking handle ) to a class' property ? For instance, System::Windows::Forms::CheckBox^ Box = gcnew System::Windows::Forms::CheckBox() I'd like to create a handle to its Checked property and use it to access and modify the same.

    Read the article

  • open source gossip-based membership protocol?

    - by Aaron
    I am looking for a library which I can plug into a distributed application which implements any gossip-based membership protocol. Such a library would allow me to send/receive membership lists, merge received membership lists, etc... Even better would be if the library implemented a protocol with performance O(logn) performance guarantees. Does anyone know of any open source library like this? It doesn't need to meet all of the aforementioned requirements; even something partially implemented would be helpful.

    Read the article

  • image merging using php in GD

    - by vipinsahu
    hi i want to merge to images but the problem is one image is .PNG format and second one is .JPG format and after merging the output should be .PNG format but the transparency is not appearing .plz help Thanks

    Read the article

  • time series in python up to microseconds

    - by Abruzzo Forte e Gentile
    Hi All I would like to handle time series in python. I have been suggested to use scikit.timeseries but I need to handle up to microseconds and this last, as far as I know, handles up to milliseconds. Do you know any other library able to do that? At some point I need to merge 2 time series sampled at different time, and I would like to avoid rewriting such kind of features or any new classes from scratch whenever it is possible. I thank you all AFG

    Read the article

  • linux piping ( convert -> pdf2ps -> lp)

    - by Bor
    Ok, so I can print a pdf doing: pdf2ps file.pdf - | lp -s But now I want to use convert to merge several pdf files, I can do this with: convert file1.pdf file2.pdf merged.pdf which merges file1.pdf and file2.pdf into merged.pdf, target can be replaced with '-'. Question How could I pipe convert into pdf2ps and then into lp though?

    Read the article

  • How is "Make Object ID" implemented in the .NET debugger?

    - by Omer Raviv
    Hi, I would like know how this feature is implemented in VS - I understand it holds some sort of weak-reference to the object in the debugged-application's memory, but how exactly is it accomplished? I know simply tracking the address (as in native code) wouldn't work, because the GC might move the object about, invalidating the address. Thanks.

    Read the article

  • svn (with git frontend) branch merging with different directory structure

    - by Fu86
    I have a subversion repository with a directory structure: frontend backend + a + b In a other branch, someone had put the sub-folders a and b in the root directory and delete the other stuff (frontend, backend). a b Now i have to merge this branch back into the trunk (backend-folder). How can I do that to dont lose the history from the branches? I use git to access and work with the subversion repository.

    Read the article

  • Rails send mail with GMail

    - by Danny McClelland
    Hi Everyone, I am on rails 2.3.5 and have the latest Ruby installed and my application is running well, except, GMail emails. I am trying to setup my gmail imap connection which has worked previously but now doesnt want to know. This is my code: # Be sure to restart your server when you modify this file # Uncomment below to force Rails into production mode when # you don't control web/app server and can't set it the proper way # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| # Gems config.gem "capistrano-ext", :lib => "capistrano" config.gem "configatron" # Make Time.zone default to the specified zone, and make Active Record store time values # in the database in UTC, and return them converted to the specified local zone. config.time_zone = "London" # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths. # All files from config/locales/*.rb,yml are added automatically. # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')] #config.i18n.default_locale = :de # Your secret key for verifying cookie session data integrity. # If you change this key, all old sessions will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. config.action_controller.session = { :session_key => '_base_session', :secret => '7389ea9180b15f1495a5e73a69a893311f859ccff1ffd0fa2d7ea25fdf1fa324f280e6ba06e3e5ba612e71298d8fbe7f15fd7da2929c45a9c87fe226d2f77347' } config.active_record.observers = :user_observer end ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.merge!(:default => '%d/%m/%Y') ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(:default => '%d/%m/%Y') require "will_paginate" ActionMailer::Base.delivery_method = :smtp ActionMailer::Base.smtp_settings = { :enable_starttls_auto => true, :address => "smtp.gmail.com", :port => 587, :domain => "XXXXXXXX.XXX", :authentication => :plain, :user_name => "XXXXXXXXXX.XXXXXXXXXX.XXX", :password => "XXXXX" } But the above just results in an SMTP auth error in the production log. I have read varied reports of this not working in Rails 2.2.2 but nothing for 2.3.5, anyone got any ideas? Thanks, Danny

    Read the article

  • sql CE 3.5 pros and cons

    - by Buzz
    Hi, Currently we are using xml files as local data store for our disconnected application, there is proposal to move to SQL CE database. Can some one with experience of SQL CE provide some pros and cons of using sql compact, for example data type support etc. As Central DB server we are using SQL Server2005. One of the requirement is to merge local store with central DB, and we don't want any data loss. Thanks

    Read the article

  • SQL Query with conditional JOIN

    - by mariki
    The scenario: Table1 CatId|Name|Description Table2 ItId|Title|Date|CatId (foreign key) I want to return all rows from Table1 and Title,Date from Table2, where The returned from Table 2 must be the Latest one by the date column. (in second table there many items with same CatId and I need just the latest) I have 2 queries but can't merge them together: Query 1: SELECT Table1.Name, Table1.Description, Table2.Title, Table2.Date FROM Table1 LEFT JOIN Table2 ON Table1.CatId=Table2.CatId Query2: SELECT TOP 1 Table2.Title, Table2.Date FROM Table2 WHERE Table2.CatId = @inputParam ORDER BY Table2.Date DESC

    Read the article

  • Visual Basic 6 ADO Update question...

    - by Dave
    Hi, I've been working with a Legacy application which interacts with a database through ADODB, and most of the changes to records follow a fairly straightforward pattern of: Create a Recordset from a query Make various change to the recordset call .Update on the recordset. What I'm wondering is, with ADODB recordsets, is there anyway to extract the 'changes'. The logic which changes the recordset is scattered about, and all I need is the changes, not how it was changed... Any suggestions for tracking changes in a recordset (in code, a trigger on the DB or similar is no use here) Thanks in advance

    Read the article

  • Merging code with dependencies? - Javascript

    - by RadiantHex
    Hi folks, this might be quite simple, but I must say I'm a bit confused on this topic. I'm writing code based on two popular libraries: jQuery underscore.js I am just wondering what would be the best way to isolate the code and prevent conflicts and how to merge it with its dependencies. By merging I mean putting them within the same file. :) I hope I'm not asking something which is too basic. ...and a last thing MERRY CHRISTMAS EVERYONE! =D

    Read the article

  • Unable to add PageFunction to my project.

    - by Shimmy
    I add to my project a PageFunction and I get a dozen of the following error and the project won't compile: 'ResourceDictionary' root element is a generic type and requires a x:Class attribute to support the x:TypeArguments attribute specified on the root element tag. Basically I get an error for each DataTemplate I merge in the ResourceDictionary, has anyone encoutered this problem before? Note: I use VB.NET 3.5 on VS 2010.

    Read the article

  • Image cropping problem

    - by Syom
    When I copy a layer in photoshop, then I want to merge it with canvas, I crop it, but it's getting smaller. I want to save its original size! Could you help me please?

    Read the article

< Previous Page | 95 96 97 98 99 100 101 102 103 104 105 106  | Next Page >