svn - Git vs. Subversion for multiple large development branches -

-

at company, using subversion. our project development process consists of "live" branch of code (this on our live web servers), general dev branch smaller projects, , each larger project has own separate branch. have @ least 2 larger project in development @ given time. merging live branch can pain, what's more of pain when large project 1 goes live, large project 2 going live little later, , merge process just... messy.

what i've been doing in svn have daily merge live (so bug fixes etc. happen) development branches. larger project merge process still messy, , i'm wondering if cleaner git. 1 example of "bad" that's happened svn, have small feature on dev, merge live, when performing live backmerge, svn tries merge feature dev again (causing conflict), unless manually deselect commit in merge. understanding, git "smart" enough know commit originated in dev, wouldn't try merge in... understanding wrong. hear git better @ automatically handling complex merges we're trying do.

so, first question be: git notably better svn we're doing, or still run same issues , just-as-hairy merges?

second question: there other integration methodologies may work better our scenario? in particular, reading article promiscuous integration seemed good, though seems exponentially harder more projects going simultaneously. again, don't expect ever have more 3 big projects @ same time, , two. continuous integration isn't option many of our projects, because tend all-or-nothing projects, or ones jarring users if pushed in parts (e.g. our recent redesign of our checkout process). this article seemed methodology our situation.

try git, not go back.

i stick svn if don't merging (i.e. work on trunk in small team). other cases, including yours sure - git make life easier.

git way better svn when comes branching, merging , resolving conflicts. think svn "one checkout dir per branch" scenario instance. moreover, git better merging/branching, people using git-svn merge svn branches. imagine other way round...

also, this answer pretty @ explaining git vs svn.


Comments

Post a Comment

Popular posts from this blog

how to insert data php javascript mysql with multiple array session 2 -

-
i have method method discussed , successful data entered 1 when more 1 can not database this programs my php form : <form class="form-horizontal" id="form-produk"> <div class="control-group" > <label class="control-label" for="kelas">kategori</label> <div class="controls"> <select class='form-control' name='id_kategori'> <?php $tampil=mysql_query("select * kategori order nama_kategori"); if ($id_kat==0){ echo "<option value=0 selected>- pilih kategori -</option>"; } while($w=mysql_fetch_array($tampil)){ if ($id_kat==$w[id_kategori]){ echo "<option value=$w[id_kategori] selected>$w[nama_kategori]</option>"; } else{ echo "<option value=$w[id_kategori]>$...
Read more

multithreading - Exception in Application constructor -

-
i wanna write snake game javafx , there exception don't know , want know how fix it. ( know it's not complete yet ) and want know , class extends application ( start override ) main in other programs? see , here not static void main bc didn't need, if want add main shoud do? it's exeption... exception in application constructor exception in thread "main" java.lang.nosuchmethodexception: main_snake.main([ljava.lang.string;) @ java.lang.class.getmethod(class.java:1819) @ com.intellij.rt.execution.application.appmain.main(appmain.java:125) and code : import javafx.animation.animationtimer; import javafx.application.application; import javafx.event.eventhandler; import javafx.scene.scene; import javafx.scene.canvas.canvas; import javafx.scene.canvas.graphicscontext; import javafx.scene.input.keyevent; import javafx.scene.layout.borderpane; import javafx.scene.paint.color; import javafx.stage.stage; import java.util.arraylist; /** * creat...
Read more

windows - CertCreateCertificateContext returns CRYPT_E_ASN1_BADTAG / 8009310b -

-
i realize similar post others (e.g. this one ), there details missing posts might significant case. to start with, here's simplified program: #include "stdafx.h" #include <windows.h> #include <wincrypt.h> int _tmain(int argc, _tchar* argv[]) { // usage: certextract certpath char keyfile[] = "c:\\certificates\\public.crt"; byte lp[65536]; security_attributes sa; handle hkeyfile; dword bytes; pccert_context certcontext; sa.nlength = sizeof(sa); sa.lpsecuritydescriptor = null; sa.binherithandle = false; hkeyfile = createfile(keyfile, generic_read, file_share_read, &sa, open_existing, file_attribute_normal, null); if (hkeyfile) { if (readfile(hkeyfile, lp, getfilesize(hkeyfile, null), &bytes, null) && bytes > 0) { certcontext = certcreatecertificatecontext(x509_asn_encoding, lp, bytes); if (certcontext) { printf("yay...
Read more