To be clear, I just executed this sequence of commands: lucas@OctoQuant:~/Documents/Shotwell/Repositories/Master$ git checkout faces Switched to branch 'faces' lucas@OctoQuant:~/Documents/Shotwell/Repositories/Master$ git merge master Auto-merging src/Photo.vala Merge made by the 'recursive' strategy. src/MediaDataRepresentation.vala | 2 +- src/Photo.vala | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) lucas@OctoQuant:~/Documents/Shotwell/Repositories/Master$ git status # On branch faces # Your branch is ahead of 'origin/faces' by 2 commits. # nothing to commit (working directory clean)
So I can merge all the changes from master into faces without incident. Lucas On Wed, Jan 23, 2013 at 6:36 PM, Lucas Beeler <[email protected]> wrote: >> Try calling >> git merge master >> on the faces branch! > > I actually tested this. I did the mega-merge in commit > 12dbe3c5ef904143b01478019bb19050ee94d9f9. This merged master into > faces. At this point, I then did some work in master, moving the > master branch forward. The master branch moved forward in > 1df3e40ded9fd64d5e2e8f1837c69958be89f0ab. And then in > 50c2c6eb39622f160639c810d7a3ade119b9245e, I merged the changes that I > made in master in 1df3e40ded9fd64d5e2e8f1837c69958be89f0ab into faces. > This was as simple as checking out the faces branch and doing a "git > merge master". What is the problem? > > Lucas _______________________________________________ Shotwell mailing list [email protected] http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
