You might want to look at 'git-rerere'
http://progit.org/2010/03/08/rerere.html

It will remember the conflicts resolution and won't ask you do it
again on rebase/merge

On Thu, Feb 24, 2011 at 6:49 PM, Claus <claus...@gmail.com> wrote:
> Hi
>
> I’m brand new to git and stumbled across this issue that annoys me a
> bit.
>
> If I do some commit’s, then pulls the repository, solves a conflict or
> two and then afterwards do a rebase –I HEAD~5 to reword some of my
> commits before I push. The rebase will complain about conflicts and I
> have to solve the same conflicts once again before I can complete the
> rebase,
>
> Is there an easy way to fix these conflicts the second time, or
> another way to do the rebase that won’t cause any conflicts when all I
> want to do is rewording some messages?
>
> Thanks
> Claus
>
> --
> You received this message because you are subscribed to the Google Groups 
> "Git for human beings" group.
> To post to this group, send email to git-users@googlegroups.com.
> To unsubscribe from this group, send email to 
> git-users+unsubscr...@googlegroups.com.
> For more options, visit this group at 
> http://groups.google.com/group/git-users?hl=en.
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to