At 9:16am -0500 Sat, 20 Nov 2010, Wols Lists wrote:
Firstly, I'm slightly surprised no-one suggested merely reverting
your patch.
But I'm guessing all you want to do is get rid of your patch and
replace it with the "official" one - so just dropping your version
should do what you want?
This
On 19/11/10 08:11, Kevin Hunter wrote:
> Hullo List,
>
> It must be something simple, but I'm having a devil of a time
> recovering from a bad merge. Given my transcript below, how do I
> recover?
>
> It usually happens after I've committed a change to my local
> repository, that I then sent in as
Michael Meeks, 19-11-2010 09:23:
Any pointers for the uninitiated would be awesome.
It rather depends if you have your own changes, if not you could do git
reset --hard to throw away your changes, and then git
pull; otherwise it is harder.
Thanks to all for the tips.
Here goes mine
At 7:23am -0500 Fri, 19 Nov 2010, Michael Meeks wrote:
Yes - I too fall over this dumb thing every time as well; you cannot
'git add' and 'git commit' the file if it is identical to the
original :-) Sometimes I cheat by doing some trivial whitespace change
(which is no doubt evil ;-). I -believe-
On Nov 19, 2010, at 0:11, Kevin Hunter wrote:
> Hullo List,
>
> It must be something simple, but I'm having a devil of a time recovering from
> a bad merge. Given my transcript below, how do I recover?
>
> It usually happens after I've committed a change to my local repository, that
> I th
Hi Kevin,
On Fri, 2010-11-19 at 03:11 -0500, Kevin Hunter wrote:
> It usually happens after I've committed a change to my local repository,
> that I then sent in as a patch. That patch got applied with a slight
> modification, and then the conflict.
Grief - what a pain; sorry about tha
Hi,
On Fri, 19 Nov 2010 03:11:51 -0500, Kevin Hunter wrote:
> $ git commit
> # Not currently on any branch.
> nothing to commit (working directory clean)
>
> $ git rebase --continue
> Applying: EasyHack: RTL macro from createFromAscii
> No changes - did you forget to use 'git add'?
>
> When you h
On Fri, Nov 19, 2010 at 03:11:51AM -0500, Kevin Hunter
wrote:
> $ git status
> # Not currently on any branch.
> # Unmerged paths:
> # (use "git reset HEAD ..." to unstage)
> # (use "git add/rm ..." as appropriate to mark resolution)
> #
> # both modified: bf_svx/source/items/svx_xmlc
Hullo List,
It must be something simple, but I'm having a devil of a time recovering
from a bad merge. Given my transcript below, how do I recover?
It usually happens after I've committed a change to my local repository,
that I then sent in as a patch. That patch got applied with a slight
