Search Results

Search found 3179 results on 128 pages for 'merge replication'.

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

• I have a library and several small programs that use it: how should I structure my git repositories?

  - by Dan

  I have some code that uses a library that I and others frequently modify (usually only by adding functions and methods). We each keep a local fork of the library for our own use. I also have a lot of small "driver" programs (~100 lines) that use the library and are used exclusively by me. Currently, I have both the driver programs and the library in the same repository, because I frequently make changes to both that are logically connected (adding a function to the library and then calling it). I'd like to merge my fork of the library with my co-workers' forks, but I don't want the driver programs to be part of the merged library. What's the best way to organize the git repositories for a large, shared library that needs to be merged frequently and a number of small programs that have changes that are connected to changes in the library?

  Read the article

• Is it legal to modify MIT licensed code and sell it?

  - by Alper

  I have a project and I want to use a ready-made script that is licensed under MIT in it. But using this script separately will be redundant. So I've decided to merge my code and the MIT licensed script in the same file. (Let's say I'll modify, improve and/or add new features to it.) I'm planning to sell this work on a market, but is it fair (legally)? NOTE: Meanwhile, I'll put (refer) the MIT licensed script's copyright already in the final file.

  Read the article

• Useful git commit messages for merged branches

  - by eykanal

  As a follow-up to this question: If I'm working on a team by myself, I can maintain useful commit messages when merging branches by squashing all the commits to a single diff and then merging that diff. That way I can easily see what changes were introduced in the branch, and I have a single summary describing the feature/change/whatever that was accomplished in that branch when browsing the master branch. My question now is, how can I accomplish this when working with a team? In that situation, the branches will be pushed to a remote repository, meaning that I can't squash all the commits in the branch down to a single commit. If the branch is public, can I still have a single useful merge commit in the master branch? (By "useful" I mean that the commit in the master line tells me (1) a useful summary of what was done in the branch and (2) diffs of the same.)

  Read the article

• JCP.Next Progress Updates

  - by heathervc

  JSR 355, JCP Executive Committee Merge, is currently nearing the end of the Public Review period.  Review the current draft here and provide feedback here.  The review closes on 12 June 2012.  The JCP Executive Committee met face to face in Sao Paulo, Brazil earlier in May, and has published a revision (version 2.1) of the EC Standing Rules.  The EC Standing Rules were introduced in October 2011 with the launch of JCP version 2.8 (JSR 348).  Version 2.1 of the EC Standing Rules will modify rules for attendance at EC face-to-face meetings. Remote observers will be permitted in "read-only" mode but unless a member attends in person they will be counted as absent.  The review period for these changes will close on June 30 2012.  Please comment on the proposed changes by logging an issue in the JCP EC issue tracker.

  Read the article

• Mercurial release management. Rejecting changes that fail testing

  - by MYou

  Researching distributed source control management (specifically mercurial). My question is more or less what is the best practice for rejecting entire sets of code that fail testing? Example: A team is working on a hello world program. They have testers and a scheduled release coming up with specific features planned. Upcoming Release: Add feature A Add feature B Add feature C So, the developers make their clones for their features, do the work and merge them into a QA repo for the testers to scrutinize. Let's say the testers report back that "Feature B is incomplete and in fact dangerous", and they would like to retest A and C. End example. What's the best way to do all this so that feature B can easily be removed and you end up with a new repo that contains only feature A and C merged together? Recreate the test repo? Back out B? Other magic?

  Read the article

• Looking for the better way to combine deep architecture refactoring with feature based development

  - by voroninp

  Problem statement: Given: TFS as Source Control Heavy desktop client application with tons of legacy code with bad or almost absent architecture design. Clients constantly requiring new features with sound quality, fast delivery and constantly complaining on user unfriendly UI. Problem: Application undoubtedly requires deep refactoring. This process inevitably makes application unstable and dedicated stabilization phase is needed. We've tried: Refactoring in master with periodical merges from master (MB) to feature branch (FB). (my mistake) Result: Many unstable branches. What we are advised: Create additional branch for refactoring (RB) periodically synchronizing it with MB via merge from MB to RB. After RB is stabilized we substitute master with RB and create new branch for further refactoring. This is the plan. But here I expect the real hell of merging MB to RB after merging any FB to MB. The main advantage: Stable master most of the time. Are there any better alternatives to the procees?

  Read the article

• What is the best tool to sync browser passwords and bookmarks?

  - by jgbelacqua

  Sadly, everything I've tried so far has been painful to manage between two computers, (even between different browsers on the same computer). So, right now I have different aggregations of bookmarks passwords in xmarks, delicious, google bookmarks, firefox sync, text files, and in figaro password manager (fpm2). I've also tried to use bindwood in the past. What I would like to do is merge all bookmarks and passwords into some solution that actually works either with tools available under Ubuntu, or with a browser-based tool (addon/plugin/extension) which works between between google-chrome/chromium, and firefox. It would be ideal if there was an ability to send and store passwords encrypted (if not on my own server). Whatever the method, I need the ability to have import from existing sources. (It doesn't have to be pretty, just repeatable.) It's possible that some things I've ruled out are now workable (e.g., xmarks broke for me at one point because I hit their bookmark limit for the server/account, and bindwood, firefox sync were firefox only).

  Read the article

• 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

• Forking an open source project using Git

  - by Cromulent

  There is an open source project that I want to fork for my own reasons. It currently has a Git mirror of its main SVN repository which I can use. What are the best techniques for forking a project whilst still maintaining the ability to merge future changes from the original project into your own forked repository using Git? Please note I will not be using Github at all for development so using any features from that is out of the question. The project will be hosted on a private VPS.

  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

• 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

• 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

• How should my local git workflow work?

  - by Anonymous -

  At home, I have a server that is running some software (on a LAMP stack, but only accessible internally). I have another machine and a laptop that I both use for developing said software. What is the best workflow for me? Should I have a repository on my local server, create a live branch, staging branch and development branch, then checkout the development branch from my laptop/development PC to work on, commit that back when I'm done, then merge the development branch with the staging branch for testing, before further merging to the live branch? Would I simply checkout the production branch to my /www/var/ on my server? Or am I thinking/going about this all wrong? Thanks.

  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

• 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

• 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

• 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

• 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

• How to maintain different settings files in TFS

  - by aggietech

  I'm currently working on integrating the TFS source control system at my work ... I run into one small problem ... I need different version of web.config (among other config files) for different branches (due to the environment that we're releasing the web application to). (for example - i don't want to merge the web.config file all the time even though there are differences ...) Is there a good way to keep track of that (instead of manually diff-ing the files)? thanks!

  Read the article

• How do you deal with monotony of certain tasks? [on hold]

  - by aaronmallen

  I love programming methods, and functions. The if {}, while {}, etc... logic behind them is so much fun. I also love making commits, merging branches, solving merge conflicts. Unfortunately these activities usually require that I create classes which I find tedious and monotonous. The simple action of defining properties, is getting in the way of me writing the logic on what to do with those properties. I can't be alone here there has to be a part of coding for everyone that they dread or at least severely dislike doing compared to other parts of coding. How do you deal with the code based tasks that you find tedious?

  Read the article

• Release Notes for 10/04/2012

  Below are the release notes from this week's deployment. Upgrade to TFS 2012 We upgraded our TFS infrastructure earlier this week. This means you can now take advantage of several improvements when you are using Visual Studio 2012, such as Local Workspaces, merge on unshelve, rollback within VS UI, etc. Improvements and Bug Fixes Enabled the ability to create more than one pull request per fork using branches. Fixed a few issues in file browsing and diffs. Removed file line limit on full diff view. Several bug fixes within the project Fork experience 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

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