On Friday, July 4, 2014 10:11:57 AM UTC+2, ayrshi...@gmail.com wrote:
> However, I have just tried to do the same thing again and I have been hit 
> with a vast number of conflicts. Now, conflicts are fine but some files 
> seem to almost be in a permanent state of conflict. For example, commit 2 
> will show as a conflict of commit 1 so rather than git realising that 
> commit 2 comes after commit 1 - it shows as a conflict.
> Is this a symptom of rebasing on top of a branch that I have previously 
> rebased on?

You will keep running into the same conflicts when rebasing like this, I 
think. You can make Git remember the conflict resolutions from previous 
rebases by enabling "rerere": http://git-scm.com/blog/2010/03/08/rerere.html

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to