On Saturday, September 21, 2013 5:18:13 PM UTC+5:30, dexter ietf wrote:
> i cloned a new tree, made changes to file readme.txt
> meantime readme.txt in the remote has changed at
> the same location. when i do a git pull i got merge
> conflicts, i resolved the conflicts and did a 'git commit'
> now i did git rebase, somehow i'm seeing the conflict
> again, now i fixed the conflict and did 'git rebase --continue'
> the conflict shows up agiain, how can i get around this,
> am i doing something wrong, or is there a bug in git ?
> any help appreciated.
i'm facing the same issue as mentioned in this thread
there seems to be no valid solution for this.
git-folks can anyone look into it.
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
For more options, visit https://groups.google.com/groups/opt_out.