.gitignore (2)
This discussion is connected to the gimp-docs-list.gnome.org mailing list which is provided by the GIMP developers and not related to gimpusers.com.
This is a read-only list on gimpusers.com so this discussion thread is read-only, too.
.gitignore | julien | 27 Apr 08:04 |
.gitignore | Ulf-D. Ehlert | 27 Apr 13:20 |
.gitignore (2) | julien | 27 Apr 08:26 |
.gitignore (2) | Roman Joost | 27 Apr 09:43 |
.gitignore (2) | julien | 27 Apr 22:03 |
.gitignore (2) | Ulf-D. Ehlert | 29 Apr 14:00 |
.gitignore (2) | Marco Ciampa | 06 May 23:49 |
.gitignore (2) | Ulf-D. Ehlert | 07 May 21:58 |
.gitignore (2) | Marco Ciampa | 08 May 00:59 |
.gitignore (2) | Ulf-D. Ehlert | 11 May 11:30 |
.gitignore
Hi,
I have added '*~' to .gitignore, to ignore back files.
My git status is:
# On branch master
# Changes to be committed:
# (use "git reset HEAD ..." to unstage)
#
# modified: .gitignore
# modified: po/fr/glossary.po
# modified: src/glossary/glossary.xml
When I run git pull, I get:
Updating 51fb9db..16adef3 error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
and when I run git pull --rebase: refusing to pull with rebase: your working tree is not up-to-date
What does that mean?
Julien
.gitignore (2)
and after git commit -a -m "Updated glossary":
Created commit 665d34a: Updated glossary
3 files changed, 773 insertions(+), 771 deletions(-)
...~/Git/gimp-help-2> git pull --rebase
Enter passphrase :
First, rewinding head to replay your work on top of it...
Applying Updated glossary
error: patch failed: src/glossary/glossary.xml:167
error: src/glossary/glossary.xml: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged .gitignore
Auto-merged src/glossary/glossary.xml
Is this commit OK now??
.gitignore (2)
On Mon, Apr 27, 2009 at 08:27:52AM +0200, julien wrote:
and after git commit -a -m "Updated glossary":
Created commit 665d34a: Updated glossary 3 files changed, 773 insertions(+), 771 deletions(-) ...~/Git/gimp-help-2> git pull --rebase Enter passphrase :
First, rewinding head to replay your work on top of it... Applying Updated glossary
error: patch failed: src/glossary/glossary.xml:167 error: src/glossary/glossary.xml: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged .gitignore
Auto-merged src/glossary/glossary.xmlIs this commit OK now??
To me, it doesn't look that your commit made it through:
http://git.gnome.org/cgit/gimp-help-2/
Cheers,
.gitignore
julien (Montag, 27. April 2009, 08:06):
I have added '*~' to .gitignore, to ignore back files.
[...]
When I run git pull, I get:
Updating 51fb9db..16adef3
51fb9db = your commit on Sun Apr 19 15:23:22 2009 +0200 16adef3 = my commit on Thu Apr 23 18:45:49 2009 +0200
error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
There was another commit changing .gitignore: my commit on Mon Apr 20 21:10:05 2009 +0200,
and obviously our versions conflict.
and when I run git pull --rebase: refusing to pull with rebase: your working tree is not up-to-date
What does that mean?
No idea (if your working tree was up-to-date, you wouldn't pull, would you?).
I think there are three ways to handle this situation:
1) remove/revert your changes to .gitignore, update, and re-apply your
changes (cowardly);
2) try to move the '*~' line within the file to a location where it
doesn't produce a conflict (cowardly and ugly);
3) study carefully the git-rebase man page (taxing, but probably the
best way).
Good luck! ;-)
Ulf
.gitignore (2)
Hi Roman,
On Mon, Apr 27, 2009 at 08:27:52AM +0200, julien wrote:
and after git commit -a -m "Updated glossary":
Created commit 665d34a: Updated glossary 3 files changed, 773 insertions(+), 771 deletions(-) ...~/Git/gimp-help-2> git pull --rebase Enter passphrase :
First, rewinding head to replay your work on top of it... Applying Updated glossary
error: patch failed: src/glossary/glossary.xml:167 error: src/glossary/glossary.xml: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged .gitignore
Auto-merged src/glossary/glossary.xmlIs this commit OK now??
To me, it doesn't look that your commit made it through:
Under Git, if I well understand, 'commit' is different from SVN commit. Under Git, commit updates the local repository from the Index. Then we can send a patch to the git remote repository using "push"... And I have not used push yet.
Julien
.gitignore (2)
julien (Montag, 27. April 2009, 22:04):
Under Git, if I well understand, 'commit' is different from SVN commit. Under Git, commit updates the local repository from the Index. Then we can send a patch to the git remote repository using "push"... And I have not used push yet.
Meanwhile I had the same problem and failed miserably to resolve it. :-(
git refused to update, rebase, or merge, and I wasn't able to resolve the conflicts I got; once I got Marco's po files as my local changes (don't know how or why) - and I never got a useful hint what to do. I had to revert changes which were not affected by Marco's commit at all (and I lost some of my changes this way).
It seems that 'git rebase' only makes sense when working with branches?!
After this hard lesson I think - working on 'master' seems to be wrong - now I will create my own branch and work on this branch only, - when working on 'master', committing changes without pushing immediately seems to be very dangerous, - I won't edit ChangeLog any more - this will create conflicts and I don't know how to handle conflicts with git.
It looks I have more to read than just the "SVN Crash Course". ;-)
Bye, Ulf
.gitignore (2)
On Wed, Apr 29, 2009 at 02:00:30PM +0200, Ulf-D. Ehlert wrote:
julien (Montag, 27. April 2009, 22:04):
Under Git, if I well understand, 'commit' is different from SVN commit. Under Git, commit updates the local repository from the Index. Then we can send a patch to the git remote repository using "push"... And I have not used push yet.
Meanwhile I had the same problem and failed miserably to resolve it. :-(
git refused to update, rebase, or merge, and I wasn't able to resolve the conflicts I got; once I got Marco's po files as my local changes (don't know how or why) - and I never got a useful hint what to do. I had to revert changes which were not affected by Marco's commit at all (and I lost some of my changes this way).
It seems that 'git rebase' only makes sense when working with branches?!
After this hard lesson I think - working on 'master' seems to be wrong - now I will create my own branch and work on this branch only, - when working on 'master', committing changes without pushing immediately seems to be very dangerous, - I won't edit ChangeLog any more - this will create conflicts and I don't know how to handle conflicts with git.
It looks I have more to read than just the "SVN Crash Course". ;-)
Bye, Ulf
Can you, please, show the commands you are using from the start(clone)?
TIA
.gitignore (2)
Marco Ciampa (Mittwoch, 6. Mai 2009, 23:49):
Can you, please, show the commands you are using from the start(clone)?
What exactly do you want to know?
Ulf
.gitignore (2)
On Thu, May 07, 2009 at 09:58:20PM +0200, Ulf-D. Ehlert wrote:
Marco Ciampa (Mittwoch, 6. Mai 2009, 23:49):
Can you, please, show the commands you are using from the start(clone)?
What exactly do you want to know?
The exact sequence of git command do you use for checkout/modify/commit/publish the gimp-manual code. So I can tell you where your commands differ from mine.
bye
.gitignore (2)
Marco Ciampa (Freitag, 8. Mai 2009, 00:59):
On Thu, May 07, 2009 at 09:58:20PM +0200, Ulf-D. Ehlert wrote:
Marco Ciampa (Mittwoch, 6. Mai 2009, 23:49):
Can you, please, show the commands you are using from the start(clone)?
What exactly do you want to know?
The exact sequence of git command do you use for checkout/modify/commit/publish the gimp-manual code. So I can tell you where your commands differ from mine.
I didn't use any special commands:
git clone
[edit files]
git add file file ...
git commit
[edit files]
git add file file ...
git commit
git push
Ulf