Search Results

Search found 4819 results on 193 pages for 'git merge'.

Page 133/193 | < Previous Page | 129 130 131 132 133 134 135 136 137 138 139 140  | Next Page >

• What's the best way to explain branching (of source code) to a client?

  - by Jon Hopkins

  The situation is that a client requested a number of changes about 9 months ago which they then put on hold with them half done. They've now requested more changes without having made up their mind to proceed with the first set of changes. The two sets of changes will require alterations to the same code modules. I've been tasked with explaining why them not making a decision about the first set of changes (either finish them or bin them) may incur additional costs (essentially because the changes would need to be made to a branch then if they proceed with the first set of changes we'd have to merge them to the trunk - which will be messy - and retest them). The question I have is this: How best to explain branching of code to a non-technical client?

  Read the article

• Eclipse Kepler apporte le support de Java EE 7, sortie simultanée entre la spécification et l'environnement de développement de la fondation Eclipse

  Une nouvelle version d'Eclipse est disponible. Elle porte le nom de Kepler. Cette version marque la fin officielle du support de la branche 3.x d'Eclipse par la Fondation. Elle continue donc sur la lancée de Juno.Des informations supplémentaires sur les nouveautés de cette version sont disponibles à cette adresse : notes pour la version 4.3.Le projet Kepler se compose de 72 projets (114 en comptant les sous-projets), pour un total d'environ 58 millions de lignes de code par 428 committers. 5 projets ont rejoint le « simulatenous release train » : EMF Diff/merge, Sphinx, Stardust, Hudson et Maven integration pour WTP (Web Tools P...

  Read the article

• I'm the .1x programmer at my company. How can I best contribute?

  - by invaliduser

  I work at a newly-minted startup of five people. We have a Ph. D in machine learning, a former member of the RSpec core team, and the guy who compiles the Git binary for OS X. That's just the employees; the founder has a Ph. D and was CTO for a multi-billion-dollar corporation before leaving to start a (successful) startup, and has now left that to start this one. We also might get a guy with a Ph. D in math. Aaaaaaaaand then there's me, college-dropout intern. I think I'm pretty smart and I'm reading non-stop, but the delta of experience, skill, and knowledge between me and my co-workers is just breathtaking. So put yourself in their shoes: you've got a bright young intern who has a lot to learn but is at least energetic. What would be annoying? What use would you hope to get out of him in the here and now? What would be pleasantly surprising if it happened?

  Read the article

• mailing for categories

  - by nerkn

  There are more than 10 categories in my site, users can register more than one category. My php script prepare contents of each category, according to user preference my script merge those contents for each user. so every user can get what category they want. Problem is I want to send 340+ mails per hour and dreamhost dont allow. What do you suggest? I think to a service like mailchimp but I couldnt find that scenario, do they support category & content etc. Can I use smtp in dreamhost?

  Read the article

• Java.net Reborn

  - by Tori Wieldt

  Java.net, the home of  Java community projects, has been re-launched with a new look and new tools for developers.  The move from CollabNet to the Kenai infrastructure offers more flexibility for developers who want to host or contribute to community projects.  Instead of the large, fixed infrastructure per project (for example, several mailing lists per project), Kenai's ala carte features allow users to take only what they need. "We will continue to have the great mix of blogs, forums, and editorial content as well as new tools on the project side, including Mercurial, Git, and JIRA for developers," Java.net Community Manager Sonya Barry explains. The migration was huge effort. Over 1400 projects were migrated (and some 30 projects are left to go). A large part of the migration was a big cleanup of abandoned projects. With the high abandonment rate of open source projects, the was a lot to remove. The new java.net site is smaller, faster and now the percentage of good, current content is much higher.Check it out at http://home.java.net/

  Read the article

• Stairway to T-SQL DML Level 4: The Mathematics of SQL: Part 1

  A relational database contains tables that relate to each other by key values. When querying data from these related tables you may choose to select data from a single table or many tables. If you select data from many tables, you normally join those tables together using specified join criteria. The concepts of selecting data from tables and joining tables together is all about managing and manipulating sets of data. In Level 4 of this Stairway we will explore the concepts of set theory and mathematical operators to join, merge, and return data from multiple SQL Server tables. Get Smart with SQL Backup Pro Powerful centralised management, encryption and more.SQL Backup Pro was the smartest kid at school Discover why.

  Read the article

• Distributing a very simple application

  - by vanna

  I have a very simple working console application written in C++ linked with a light static library. It is just for testing purposes. Now that the coding part is done, I would like to know the process of actually distributing the program. I wrote a very basic CMakeLists.txt that create makefiles or VS projects to build the sources. I also have a program that calls the static library in order to make some google tests. To me, the distribution of this application goes like this : to developpers : the src directory with the CMakeLists.txt file (multi-platform distribution) with a README.txt and an INSTALL.txt to users : the executable and a README.txt on my git repo : everything mentionned above plus the sources for testing and the gtest external lib A this point : considering the complexity of my application, am I doing it right ? Is there any reference that would formalize this distribution process so I can get better and go further ? Say I would like to add dynamic libraries that can be updated, external libraries like boost : how should I package this to distribute it in a professionnal way ?

  Read the article

• Continuous Integration, what are the strategies to manage binary content?

  - by sebas

  Currently we are testing various configurations between Feature Branching and CI with Feature toggling. I can see there are several viable options out there for the code, but I also know that CI totally relies on the possibility to merge the code. So I wonder, how do you manage CI with binary data, like art assets? I can also see another problem: all the code can be tested before to commit, I can even validate the data before to commit, but how can I test the art?! Should I use another methodology for art content?

  Read the article

• Unable to install Emerald theme manager in Ubuntu 12.04?

  - by kernel_panic

  I learnt how to install ETM from here But when i try to install i get `ubu@sanjay-pc:~$ sudo apt-get install git autoconf libtool libwnck1.0-cil-dev libwnck-dev intltool libdecoration0-dev gawk Reading package lists... Done Building dependency tree Reading state information... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming.code The following information may help to resolve the situation: The following packages have unmet dependencies: libdecoration0-dev : Depends: libdecoration0 (= 1:0.9.7.6-0ubuntu1) but 1:0.9.7.8-0ubuntu1 is to be installed E: Unable to correct problems, you have held broken packages. ` Help Needed

  Read the article

• Fixing a bug while working on a different part of the code base

  - by imgx64

  This happened at least once to me. I'm working on some part of the code base and find a small bug in a different part, and the bug stops me from completing what I'm currently trying to do. Fixing the bug could be as simple as changing a single statement. What do you do in that situation? Fix the bug and commit it together with your current work Save your current work elsewhere, fix the bug in a separate commit, then continue your work [1] Continue what you're supposed to do, commit the code (even if it breaks the build fails some tests), then fix the bug (and the build make tests pass) in a separate commit [1] In practice, this would mean: clone the original repository elsewhere, fix the bug, commit/push the changes, pull the commit to the repository you're working on, merge the changes, and continue your work. Edit: I changed number three to reflect what I really meant.

  Read the article

• Do they ask too much on this job?

  - by user58404

  I am looking for web developer job and this job description caught my eyes. I am not sure how much they offer but I was wondering if anyone here meets all of their requirements? To me, that's a lot of knowledge. 2 to 4+ years experience building web sites and applications in a professional environment Strong working knowledge of HTML5 and CSS3 Strong working knowledge of JavaScript, jQuery, AJAX Working knowledge of Ruby on Rails or similar MVC framework Working knowledge of ExpressionEngine, Wordpress or similar CMS Experience administering a LAMP-based server Experience with cross-platform and cross-browser website testing Comfortable working with version control (preferably Git) Proficient with Adobe Photoshop, Illustrator, and Fireworks Comfortable working on a Mac Self-starter with excellent time-management skills with the ability to meet challenging deadlines Ability to work independently with minimal supervision Desire to work on a small team Bonus Skills: Experience deploying to Heroku or similar PaaS provider. Experience developing Facebook applications A strong sense of design Cool open source projects (send us your Github account!) Advanced working knowledge of server administration and website deployment. Java and/or .NET experience

  Read the article

• game is playing but broken graphics

  - by mewanttux

  I installed Steam on Lubuntu and wanted to play dota2 (it has source engine) and it sayed i need a 3dts driver or something but i installed it alredy. I can start dota now, but when i start a game it is not... displaying correctly. For example when i pick a hero the 3d modell is covered in some kind of a lasershow and the map...... i looked around a bit think it is because of the drivers and i should have mesa 9. Steam can show the system specs and it says that i have nouveau Gallium 0.4 on NVAA as driver and 3.0 Mesa 10.0.0-devel (git-1100093 saucy-oibaf-ppa) as driverversion and OpenGL 3.0 i am a noob on linux and need step by step guides please

  Read the article

• GitHub OS project how to have a good version and a work in progress version

  - by Para

  I have started my own OS application, I am hosting it on GitHub. My problem is that I push changes to the repository from more than one location so sometimes I want to work on it and sometimes I can't always finish something in time but I would still like to push it anyway so I can fetch it later from my other location. I'd like to be able to somehow have a stable version and have the master branch be a 'work in progress'. How do I do this? Is there some button I can push that will take the code from my master branch and make it into a zip file in my downloads tab and call it a version or should I do this by hand? Would it be better to have the master branch be nice and neat and have a separate branch to play with and then merge the two when the time is right? Would this not cause more problems in the merging phase?

  Read the article

• Can emsripten compile down to Canvas-based Js instead of WebGL?

  - by Sebastian Scholle

  I understand that emscripten compiles down LLVM to JS and it converts OpenGL Calls to WebGL. Thats a fairly simple translation. Is there a way to tell emscripten to use some other graphics Library ( for example Pixi JS ) for its rendering code translations? Is the compiled JS code easy to update or would it be better to merge in your own Graphics API that handles WebGL/Canvas calls. IE: can we use a C++ Graphics Wrapper Library that when compiles to JS, will simply plug into our own JS Graphics Wrapper Library? Im assuming YES, but has anyone tried this? And if So, what would be your technique, as my C++ skills are basic.

  Read the article

• Staying concentrated during small pauses [migrated]

  - by 9000

  My workflow includes some steps that make me wait for 0.5 to 2 minutes to complete: long remote git operations, creating / rebooting an instance in the cloud, etc. It's safe to assume that these operations cannot be made any faster. The resulting delays are the biggest flow-breakers for me. These are too long to just sit and stare at the progress indicators, but too short to take a walk and grab a coffee. Temptation to check some websites is big, and it's often a road to 20-30 minutes of procrastination + the time to get into the flow again. What are your coping strategies?

  Read the article

• When is it appropriate to use colour in a command-line application?

  - by marcoms

  Currently I have a command-line application in C called btcwatch. It has a -C option that it can receive as an argument that compares the current price of Bitcoin with a price that was stored beforehand with -S. Example output with this option is: $ btcwatch -vC # -v = verbose buy: UP $ 32.000000 USD (100.000000 -> 132.000000) sell: UP $ 16.000000 USD (100.000000 -> 116.000000) The dilemma is whether to use colour for the UP or DOWN string (green and red, respectively). Most command-line applications I know of (apart from git) stay away from colour in their output. In my desire for btcwatch to look and be quite "standard" (use of getopt, Makefiles, etc), I'm not sure if colour would look out of place in this situation.

  Read the article

• How do I find out on which partition is my Windows?

  - by Perlnika

  I have fully functional Windows and Ubuntu that is broken (I accidentaly broke it) and want to do reinstall. With Live-CD, I can see: 3 NTFS partitions, one ext4 and one unknown. How do I find out which partitions belong to Windows? I thought that I might delete everything that wasn't NTFS, but I was afraid. Now I am using: Install Ubuntu alongside them option, but I guess that this will leave my broken Ubuntu untouched. So, again, I need to know which partitions to merge (perhaps add partitions of broken Ubuntu to new Ubuntu?). Please, how can I learn how my system is divided? Thanks a lot.

  Read the article

• Difference in stats on the same domain - seo related

  - by Duoweb

  Recently i started to optimize my company's website. With a little help of market samurai. One of the adjustments was a www redirect to the prefered domain. We currently rank on #8 for our desired keyword with the domain without the www. If I add a custom url (our domain with www), we see a difference in stats BLP (backlinks to the page) {it's the website on top} Can anyone tell me how i could merge this so we might even rank better for our keyword? What I did so far: 3 weeks ago set the www.duo.be as prefered domain in GWT and put a 301 redirect in place so the duo.be gets redirected to www.duo.be Both domains are in GWT and both with www.duo.be as preferred domain. Tho I see no change. Can anyone help me out, because i'm clueless. Marketsamurai screenshot: http://i.stack.imgur.com/CYkb8.png

  Read the article

• Release Notes for 11/20/2012

  The CodePlex team deployed a few times over the last week. Below is a roll-up of changes: Fixed issue with being able add additional commits to pull requests - Thanks to Oren Novotny Fixed problem with issue summaries breaking within words - Thanks to Jeff Handley and SoonDead Corrected inconsistencies between the time displayed on the history page and previous versions page for Git/Hg commits. Fixed perma-link issue when linking to forks. - Thanks to Scott Blomquist Fixed problem with connecting via Windows Live Writer - Thanks to yufeih Fixed source browsing problem when folders have special characters. Fixed AppHarbor service hooks for Mercurial projects. Have ideas on how to improve CodePlex? Please visit our suggestions page! Vote for existing ideas or submit a new one. As always you can reach out to the CodePlex team on Twitter @codeplex or reach me directly @mgroves84

  Read the article

• Continuing to code on large projects

  - by user3487347

  I am a hobbyist programmer, and I've started many medium - sized projects to work on just by myself. These include games, a raytracer, physics simulations etc. By the time these projects get to a certain size (around 5000 lines), I begin to slow down in adding features to the program. This is not because of a lack of ideas of what to implement in a program, but rather a struggle in how to go about it. In particular, I'm afraid of breaking what I already have working in order to implement a new feature. I've tried using version control like Git and Subversion, but these seem unnecessary when you are a one man team. I simply have a folder of "versions" of my program, one for each major change I make. How do I keep coding past this 5000 line mark? What about the 50000 line mark?

  Read the article

• Joining and compressing all javascript files together - good idea?

  - by Tomáš Zato

  Curently, I avoid loading any unnecesary scripts on individual pages of my site. I have a class that remembers all javascript files that were requested during PHP processing and adds them to HTML. I was just thinking that I could merge the current set of files, save the result in special directory and let the browser download just one, big file. Since the number of possible combinations is not very high, I would end up with about 10 combined files for different pages. I've never seen that on any site. What are the reasons not to do it? I need very fast page load.

  Read the article

• Needs management tool for .java files

  - by Chris Okyen

  When I open the src file in the project folder in Package Explorer in Eclipse, it says the following: Error retrieving content description for resource '/GuiAdd/src/GuiAdd.Java.' Now, the directories of the source projects shown in Eclipse Package explorer doesn't always have the source file to link to, causing this message. I need a way to sync the folders in the correct directory without overwriting the newest ones. Some source files I project files of the root which the Package explorer links to may be the correct versions but other source files in the root may not have the latest source or any source. I am not using svn/git or other depository programs.

  Read the article

• Release Notes for 4/6/2012

  Here are the notes for this week’s release: Fixed an issue where authenticating against Mercurial using capital letters would fail. Fixed an issue where comments in pull requests were not word wrapping correctly. Fixed an issue where usernames would overflow their allotted space in discussions. Fixed an issue that would cause unexpected errors on the source code pages if you created a Git and Mercurial fork with the same name. Have ideas on how to improve CodePlex? Visit our ideas page! Vote for your favorite ideas or submit a new one. Got Twitter? Follow us and keep apprised of the latest releases and service status at @codeplex.

  Read the article

• Resolving equivalence relations

  - by Luca Cerone

  I am writing a function to label the connected component in an image (I know there are several libraries outside, I just wanted to play with the algorithm). To do this I label the connected regions with different labels and create an equivalence table that contain information on the labels belonging to the same connected component. As an example if my equivalence table (vector of vector) looks something like: 1: 1,3 2: 2,3 3: 1,2,3 4: 4 It means that in the image there are 2 different regions, one made of elements that are labelled 1,2,3 and an other made of elements labelled 4. What is an easy and efficient way to resolve the equivalences and end up with something that looks like: 1: 1,2,3 2: 4 that I can use to "merge" the different connected regions belonging to the same connected component? Thanks a lot for the help!

  Read the article

• mailing for categories

  - by nerkn

  There are more than 10 categories in my site, users can register more than one category. My php script prepare contents of each category, according to user preference my script merge those contents for each user. so every user can get what category they want. Problem is I want to send 340+ mails per hour and dreamhost dont allow. What do you suggest? I think to a service like mailchimp but I couldnt find that scenario, do they support category & content etc. Can I use smtp in dreamhost?

  Read the article

< Previous Page | 129 130 131 132 133 134 135 136 137 138 139 140  | Next Page >