Re: Git merging fun and a local clone-per branch workflow

On 03/22/2012 05:09 PM, Kiall Mac Innes wrote:

Right - git diff shows the different between HEAD (The last commit of the branch your are currently on) and what you have yet to commit.

I was doing the diffs compared with the origin/* branches, as shown in the gist, https://gist.github.com/2165086

2 commits will be merged - Assuming nobody else has changed 5.3 since the last time anyone merged it into 5.4 If on the other hand, someone else committed to 5.3, did not merge to 5.4, and you have that commit in your 5.3 branch.. then the merge will do 3 commits, even though you only made 2. This is likely what you saw.

Maybe! At this stage finding the best workflow that allows multiple local branch directories to co-exist and aligns with PHP's general git processes is the issue. I notice Dmitry mentioned git-new-workdir. Does anyone have a workflow and comments on that (including with respect to NEWS)?

git log --oneline --graph is a useful command to try and understand what happened, and what was merged where..

gitk shows this too.

Thanks, Kiall

Thanks for the comments. Chris -- Email: christopher.jones@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/