Because I cannot delete the binary file on the remote branch I
copied the file from github.com using 'raw' and saved it directly
into the local branch and committed it.
So now the merge should see the files as identical.
However the merge still fails saying binary fi
one of the branches is a remote branch
I cannot find a way to delete the file on this branch
either in git / git win gui
or on github.com where the 'actual' remote repository resides.
What do you suggest?
On 22/05/2012 19:22, Philip Oakley wrote:
From: "Andrew Hardy" Sent: Tuesday, May
22, 20
From: "Andrew Hardy" Sent: Tuesday, May
22, 2012 6:59 PM
I have changed the git ignore file to ignore *.suo
however I had a *.suo file which will not merge from one branch to
another because it is binary.
So i deleted it from the "merge to" branch thinking this would allow
me
You need to
I have changed the git ignore file to ignore *.suo
however I had a *.suo file which will not merge from one branch to
another because it is binary.
So i deleted it from the "merge to" branch thinking this would allow me
to merge and it would just be added
rather than a binary merge being ate
On Tue, 22 May 2012 16:08:54 +0100
Andrew Hardy wrote:
> I did a reset master branch to here and used the wrong reset type I
> think.
>
> Consequeently my master branch was screwed up.
[...]
> Will I just have to keep working with dev3 all the time from now on?
To be honest I faild to understan
I did a reset master branch to here and used the wrong reset type I think.
Consequeently my master branch was screwed up.
I managed to create two dev branches at different points and
appropriately merge them and I now have a branch dev3 which has all the
right stuff in and was at the top of th
I am experimenting with git-subtree (the tool recently added to contrib,
not the merge strategy) and I have stumbled upon some problems with
rebasing.
git-subtree's commits are relative to the subrepo's root, so in a rebase,
all files from the subrepo are added to my main repo's root.
I tried
Looks to me like your git server is simply overloaded. Run a h/top/"vmstat
-n 1" on it in a different window and only retry the push when CPU usage on
the server drops below 50%.
If the push never succeeded I would've expected invalid ssh/git
credentials...
You might also want to check your
Thx :-)
Am Dienstag, 22. Mai 2012 11:09:33 UTC+2 schrieb Thomas Ferris Nicolaisen:
>
> Hi Thorsten,
>
> This is one of the recent changes in Git to make it more user friendly.
> More specifically in this point, help users avoid these automatic merge
> messages that can sometime be a bit ugly.
>
Hi Thorsten,
This is one of the recent changes in Git to make it more user friendly.
More specifically in this point, help users avoid these automatic merge
messages that can sometime be a bit ugly.
>From http://git-scm.com/docs/git-pull :
--no-edit
Invoke an editor before committing successf
On Tue, May 22, 2012 at 12:22 PM, Thorsten Peters
wrote:
> After update git to latest version, git pull asks for a commit comment
> if a merge is needed.
>
> Is there an option to "auto commit" with default comment at git pull?
You may use "git pull --no-edit" or set GIT_MERGE_AUTOEDIT environmen
After update git to latest version, git pull asks for a commit comment
if a merge is needed.
Is there an option to "auto commit" with default comment at git pull?
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, se
12 matches
Mail list logo
