Offline I asked Peter about a couple of files that git status and git
pull mention.
> When I enter "git status" I see the following modified files.
>
> # modified: applications/gaia/gaia/configure
> # modified: applications/star2html/component.xml
>
One (applications/gaia/gaia/configure) seems to be Tim's change of a
version increment, and the other (applications/star2html/component.xml)
uses my local directories instead of Peter's, changed during the build.
I clearly don't want to commit local installation paths to the
respository.
% git pull
remote: Counting objects: 22, done.
Compressing objects: 100% (16/16), done.)
remote: Total 16 (delta 11), reused 0 (delta 0)
Unpacking 16 objects...
100% (16/16) done
* refs/remotes/origin/master: fast forward to branch 'master' of
ssh://starlink.jach.hawaii.edu/web/starlink/git/starlink
old..new: e6f1878..55d51d8
applications/gaia/gaia/configure: needs update
applications/star2html/component.xml: needs update
fatal: Entry 'applications/star2html/component.xml' not uptodate. Cannot merge.
Merge with strategy recursive failed.
How do I "update" these files? I tried removing them and running git
pull again.
% git pull
applications/gaia/gaia/configure: needs update
applications/star2html/component.xml: needs update
Auto-merged .gitignore
CONFLICT (content): Merge conflict in .gitignore
Removed libraries/ast/ast_tester/make_testxmlchan
Automatic merge failed; fix conflicts and then commit the result.
Whst's the git approach to conflict?
Malcolm
|