git: need to build on one branch and merge that branch to another branch -


our builds take long time. unit tests 4 hours. trying build , run unit tests on master. @ same time need merge master branch a.

is there way not change files on file system , merge branch

---------\-----master           \----a

something "git merge from_branch to_branch" or "git merge to_branch from_branch" have observered posts alais "git checkout a; git merge master" not want do. can't checkout because have processes needing access files in master

thanks

our builds take long time. unit tests 4 hours. trying build , run unit tests on master. @ same time need merge master branch a.

there's few practices eliminate problem. first not work on master, exclusively on feature branches. master should used starting new feature branches , integrating tested feature branches. practice solves lot of problems.

- b - c - d [master]            \             e - f - g [feature]

use git merge master keep feature branch date changes in master (alternatively git rebase master avoid lots of unnecessary merge points). feature branches can safely pushed without endangering other branches.

second use continuous integration server. is, have dedicated machine nothing build , run full test suite on whatever pushed central repository. has advantage of providing environment close real production environment possible (not whatever happens on development machine). travis ci example of ci service, jenkins open source installable ci server.

note can run own ci server on virtual machine on own desktop.

with in place, no longer need wait around long tests finish. can safely push feature branch , ci server runs tests. meanwhile can whatever want development copy.

if don't want , wish continue working on master , running long tests on development machine, simplest solution clone your development copy new location testing. cloning development copy, not shared remote copy, means have work , branches.

git clone /path/to/my/devel /path/to/my/tests

run tests in /path/to/my/tests , development work in /path/to/my/devel.


Comments

Post a Comment

Popular posts from this blog

1111. appearing after print sequence - php -

morning, i have code takes string of shoe sizes, explodes , puts in table. code works , info displayed correctly on page after table there few 1's after table. i'm confused this. so table looks (in columns of 3 on webpage) available in following sizes: 3 4 5 6 9 10 111 here's codes, purpose of example $x = 3|4|6|10|9 function get_sizes_pipe($x) { $counter = 0; $splits = explode("|",$x); asort($splits); $x = print "<table class='greentable'>"; $x .= print "<thead><tr><th scope='col' colspan='3' abbr='starter'>available in following sizes:</th></tr></thead><tbody><tr>"; foreach ($splits $split) { $entry = print "<td>".$split."</td>"; if($counter == 2){ $entry .= print "</tr><tr>"; $counter =0; } else { $counter++; ...
Read more

java - WARN : org.springframework.web.servlet.PageNotFound - No mapping found for HTTP request with URI [/board/] in DispatcherServlet with name 'appServlet' -

this question has answer here: why spring mvc respond 404 , report “no mapping found http request uri […] in dispatcherservlet”? 3 answers i trying making simple bbs i'm encountering following error, warn : org.springframework.web.servlet.pagenotfound - no mapping found http request uri [/board/] in dispatcherservlet name 'appservlet' i have tried solve error many times, have failed. how can solve error? here web.xml, controllerand , servlet-context. my web.xml <?xml version="1.0" encoding="utf-8"?> <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/xmlschema-instance" xsi:schemalocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <filter> <filter-nam...
Read more

Ruby on Rails, ActiveRecord, Postgres, UTF-8 and ASCII-8BIT encodings -

weirdest error, who’s challenge try , me? spent hours yesterday on , it’s magic. can't believe happening , it's driving me crazy. btw, using: rails 4.2.3 ruby 2.2.3 pg 0.18 encoding.default_internal = encoding.default_external = utf-8 config.encoding = 'utf-8' it has postgres, activerecord , encodings! turns out we’ve been getting these errors whenever create new users on database special characters: encoding::undefinedconversionerror: "\xc3" ascii-8bit utf-8 \xc3 may vary depending on characters. weird part we’ve set since beginning utf-8. makes no sense , digged it, , used script: user.all.each |user| user.attributes.each |name, value| if value.is_a? string puts user.email + name.encoding.to_s + value.encoding.to_s end end end and output of 1 of users, users same: dr_lottahelp@blahblah.comutf-8utf-8 dr_lottahelp@blahblah.comutf-8ascii-8bit dr_lottahelp@blahblah.comutf-8ascii-8bit dr_lottahelp@blahblah.comutf-8asci...
Read more