[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gits] best practice question

so I’m using git for a paper I’m writing. I recently branched off a version for a document we’re preparing for a workshop: the main document (in prep for a conference later on) is still in the master branch.

But I’m constantly encountering things that should be in both branches (like relevant papers, bib entries, and common notes). so far I’ve been cherry picking updates as necessary, but that’s a little painful. 

Is there a ‘best practice’ for how to do this properly ? or should I just not have created a branch

Suresh Venkatasubramanian  Web: http://www.cs.utah.edu/~suresh/    
Blog: http://geomblog.blogspot.com/
Associate Professor, 
School of Computing, University of Utah

Why is it that buying a thought costs a penny, but freely given thoughts are two cents ? -- Heard on the internet.