Skip to content

Commit

Permalink
Merge pull request #1028 from santana/docfix
Browse files Browse the repository at this point in the history
typos
  • Loading branch information
guillep authored Oct 15, 2018
2 parents a39ee7f + d99c0d8 commit a0a0567
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/The-Working-Copy(ies).md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Well, this is not really necessary for iceberg to work. Iceberg could just write
The reason for this working copy to be there is just to try to be less alien.
Having the disk working copy allows people to still have a way to:
- edit non-smalltalk files from the command like
- use the non command line as a last ressource if something goes wrong with your Pharo image
- use external tools to manage the repository (sourcetree, git kraken, whatever you're confortable with)
- use the non command line as a last resource if something goes wrong with your Pharo image
- use external tools to manage the repository (sourcetree, git kraken, whatever you're comfortable with)

The idea is that Iceberg will try to keep your disk working copy in sync with your repository HEAD.
It will take care of transparently synchronizing your disk working copy when:
Expand All @@ -26,6 +26,6 @@ The thing is that this is much more difficult than it sounds:
- What happens if you share your repository between several images?
- Or if suddenly you change your branch from the command line to something completely different?

Several of these usecases don't even make sense. So we preferred to choose the path of "make it explicit".
Several of these use cases don't even make sense. So we preferred to choose the path of "make it explicit".
Of course, we could do better, we are open to discuss any improvements.
Just take into account that Iceberg did not come from an egg :) we have thought about many possible scenarios and discussed with a lot of people before.
Just take into account that Iceberg did not come from an egg :) we have thought about many possible scenarios and discussed with a lot of people before.

0 comments on commit a0a0567

Please sign in to comment.