Changes between Version 70 and Version 71 of squeak_screencasts


Ignore:
Timestamp:
11/23/2015 02:16:56 PM (7 years ago)
Author:
jakob.reschke
Comment:

add a text transcript for the git filetree collaboration video

Legend:

Unmodified
Added
Removed
Modified
  • squeak_screencasts

    v70 v71  
    378378Download mp4 video:[[attachment:FiletreeGitMerge.mp4]]
    379379Download webm video: [[attachment:FiletreeGitMerge.webm]]
     380
     381'''Transcript for those preferring to read text'''
     382
     383- Use `git fetch && git merge --ff-only origin/master` instead of `git pull`, so you can perform the actual Merge or Load operation using the Monticello tools in Squeak.
     384- If new commits are created concurrently in git, you will have to do an actual merge before you can push.
     385- You will not be able to merge using the fast-forward strategy and there would be conflicts in the filetree metadata if git tries to figure out the merge by itself.
     386- In order to remedy the situation, do the git merge preferring changes from the remote repository: `git merge -s recursive -X theirs origin/master` (since you still have your changes in the image, nothing is lost).
     387- Perform the actual merge in the Squeak image using Monticello.
     388- Save your merge to the filetree using Monticello Save.
     389- Commit and push your changed filetree with git.
     390- You may want to amend the merge commit.
    380391
    381392== Filetree and Git: Merging two branches with !GitFileTree-!MergeDriver ==