On Thu, Aug 9, 2012 at 11:50 AM, Tim Moore wrote:
> If you are going to keep a branch for a long time that you are not
> merging back into e.g., master, there are a couple of possibilities.
> One is to merge (pull) master into your branch. Another is to check
> out git-rerere (I kid you not), which records merge conflict
> resolutions and reapplies them automatically when needed. With that
> you can either rebase repeatedly or never rebase and periodically do
> test merges with master.
>
My typical workflow is to pull the master branch (daily at least) and then
when there are updates, checkout my private branch and "git merge master".
That's worked fine, except it is my understanding that this is frowned
upon because some day if I ever cherry pick something back into the master
branch, the commit log will get prefaces with a couple hundred "merge"
messages. The rebase supposedly puts my local changes at the top. Every
thing generally works as it's supposed to I think, except the double
directory mv in a single commit seemed to completely confuse the subsequent
rebase. I think I'm just going to file this under: git gives you more than
enough rope to hang yourself by, especially when you venture away from the
simple/common usage cases and don't have a complete understanding of what
git does under the hood and how each command manipulates the internal
state. I haven't lost anything (other than 2 days of my life) :-) -- and I
still have my old branch, now renamed with all the history; so for the
moment I've created a new branch, moved all the different stuff to that (I
hope) and will continue on from there.
Regards,
Curt.
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
