Products
Services
Support
Purchase
Downloads
News & events
Company
Monday, March 30, 2009
Disintegrating changes with GIT and with Plastic
I've just published a post explaining how disintegration (or subtractive merge if you prefer) works in GIT and Plastic SCM.
You can find the full article
here
.
Normally I'd just focus on what we do with Plastic SCM, but since GIT is big among OSS developers (and
Monologue
readers), I thought it could be good to explain how it works there too.
Enjoy
0 comments:
Post a Comment
Newer Post
Older Post
Home
Subscribe to:
Post Comments (Atom)
Subscribe Now!
Subscribe in a reader
Plastic Screenshots
Loading...
Labels
Agile
(1)
annotate
(1)
backend
(2)
best practices
(2)
branch diagram
(2)
branching
(3)
c#
(7)
Cmmi
(1)
ddj
(3)
delphi
(2)
development
(14)
distributed
(6)
eclipse
(1)
email
(1)
Functional Testing
(1)
git
(1)
GUI
(1)
integrations
(9)
logging
(1)
Mac
(1)
merging
(3)
mono
(51)
news
(34)
news merging
(1)
plastic
(19)
remote
(1)
replicate
(1)
scm
(41)
Scrum
(1)
secure channel
(1)
security
(2)
selectors
(3)
solaris
(2)
ssl
(1)
task
(2)
testing
(5)
visual studio
(4)
Blog Archive
▼
2009
(15)
►
October
(1)
CodeCamp 2009 - Tarragona
►
July
(1)
6 Ways Plastic SCM Branches Are Better
►
June
(2)
It's Not All Technical: The Million Dollar Raspber...
Parallel Development With Plastic SCM
►
May
(2)
Plastic SCM & PowerBuilder installation guide
Self documented development through inch-pebble ch...
►
April
(3)
Finding who’s to blame – Plastic SCM annotate
Using Changes app
stackoverflow campaign
▼
March
(6)
Disintegrating changes with GIT and with Plastic
Merge Without Fear
Test before you run...
Setting up a fallback server using replication
Live to merge, merge to live (3 parts out)
SD West 2009
►
2008
(69)
►
December
(6)
Plastic is a Jolt Finalist!
Merge to live, live to merge
Plastic on Solaris 10
OpenSolaris and MWF
White testing Plastic
Distributed development with Plastic
►
November
(4)
Announcing Plastic 2.7
C# Evaluator
Branching Basics Video
Plastic Quick Start Video
►
October
(4)
Troubles in .NET remoting when IP changes
New blog posts
Agile Scrum, CMMi, Testing and Continuous Integrat...
SSL Enabled Plastic Connections
►
September
(3)
Check In Changes using Email
Running Plastic on Ubuntu
Firebird is faster than filesystem for blob storag...
►
August
(10)
What's coming? New Visual Studio AddIn
Configure SQL Server database backend
Decompressing zip files with C#
Plastic SCM working with Trac II
Building task branches with CruiseControl
How to use Plastic SCM and TechExcel DevTrack II
Plastic SCM working with Trac
Xmerge tool to handle refactors (screencast)
4 steps to make version control shine
How to use Plastic SCM and TechExcel DevTrack I
►
July
(9)
Plastic SCM working with JIRA part II
Plastic SCM working with JIRA Part I
Mono repository on Plastic
Plastic SCM and Mantis II
Plastic SCM and Mantis I
How to use Plastic SCM and Bugzilla Part I
New Release: Plastic SCM 2.5 is out!
MD5 vs SHA1
►
June
(4)
►
May
(4)
►
April
(8)
►
March
(9)
►
February
(1)
►
January
(7)
►
2007
(53)
►
November
(6)
►
October
(3)
►
September
(2)
►
August
(9)
►
July
(4)
►
June
(2)
►
May
(9)
►
April
(3)
►
March
(1)
►
February
(7)
►
January
(7)
►
2006
(56)
►
December
(8)
►
November
(9)
►
October
(7)
►
September
(4)
►
August
(5)
►
July
(6)
►
June
(5)
►
May
(10)
►
April
(2)
Version Control
Branching Patterns
Crossroads forums
Distributed SCM
0 comments:
Post a Comment