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 the tree in gitk view

Following this I thought to merge this back into the master to make things neat and to be using master as the latest.

However the local merge of dev3 (all correct) 'into' master (messed up) (which was offered for merging) but said merging by some automatic process (I forget what called, but to do with the ordering) and then said nothing to do, all up to date.

However the master branch still has a load of stuff missing from the correct and up to date dev3 branch.

Will I just have to keep working with dev3 all the time from now on?

Please advise...

This message sent via VFEmail.net
$14.95 Lifetime accounts! 15GB disk! Commercial Mail Options! No bandwidth quotas!

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 
For more options, visit this group at 

Reply via email to